bzr commit into mysql-pe branch (azundris:3647) Bug#48295

[Tatiana A. Nurnberg]

#At file:///Users/tnurnberg/forest/48295/60-48295/ based on revid:azundris@stripped

 3647 Tatiana A. Nurnberg	2009-11-02
      Post merge fixies. Also makes 6.0 "explain extended" behaviour more like
      5.1, id est, more verbose. If this blows up in unforeseen ways in the future,
      this is the CS to revert. We'll lose some minor debug info for the customers
      this way ("explain extended" even for invalid queries, partial info if that's
      all we can do), but maybe, that'll be necessary. Doesn't look it so far though.
      cf. Bug#48295

    modified:
      mysql-test/r/subselect3.result
      sql/sql_parse.cc
=== modified file 'mysql-test/r/subselect3.result'
--- a/mysql-test/r/subselect3.result	2009-09-21 12:56:38 +0000
+++ b/mysql-test/r/subselect3.result	2009-11-02 12:59:14 +0000
@@ -873,6 +873,9 @@ Level	Code	Message
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.t1.c' of SELECT #3 was resolved in SELECT #2
 Error	1054	Unknown column 'c' in 'field list'
+Note	1003	select `c` AS `c` from (select (select count(`test`.`t1`.`a`) AS `COUNT(a)` from dual group by `c`) AS `(SELECT COUNT(a) FROM 
+(SELECT COUNT(b) FROM t1) AS x GROUP BY c
+)` from `test`.`t1` group by `test`.`t1`.`b`) `y`
 DROP TABLE t1;
 End of 5.0 tests
 #  

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-11-01 08:53:43 +0000
+++ b/sql/sql_parse.cc	2009-11-02 12:59:14 +0000
@@ -4970,11 +4970,7 @@ static bool execute_sqlcom_select(THD *t
         return 1;                               /* purecov: inspected */
       thd->send_explain_fields(result);
       res= mysql_explain_union(thd, &thd->lex->unit, result);
-      /*
-        The code which prints the extended description is not robust
-        against malformed queries, so skip it if we have an error.
-      */
-      if (!res && (lex->describe & DESCRIBE_EXTENDED))
+      if (lex->describe & DESCRIBE_EXTENDED)
       {
         char buff[1024];
         String str(buff,(uint32) sizeof(buff), system_charset_info);


Attachment: [text/bzr-bundle] bzr/[e-mail]