bzr commit into mysql-5.4 branch (Alexey.Kopytov:3461) Bug#46075

[Alexey Kopytov]

#At file:///Users/kaa/src/bzr/bugteam/bug46075/my60-bug46075/ based on revid:alexey.kopytov@stripped

 3461 Alexey Kopytov	2009-07-25
      Fixed the patch for bug #46075 for 6.0: pass 
      ME_FATALERROR flag to print_error() instead of
      calling THD::fatal_error().
      modified:
        sql/sql_select.cc

per-file messages:
  sql/sql_select.cc
    Fixed the patch for bug #46075 for 6.0: pass 
    ME_FATALERROR flag to print_error() instead of
    calling THD::fatal_error()
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2009-07-24 12:13:06 +0000
+++ b/sql/sql_select.cc	2009-07-24 20:04:58 +0000
@@ -15535,8 +15535,7 @@ create_internal_tmp_table_from_heap2(THD
       We don't want this error to be converted to a warning, e.g. in case of
       INSERT IGNORE ... SELECT.
     */
-    thd->fatal_error();
-    table->file->print_error(error,MYF(0));
+    table->file->print_error(error, MYF(ME_FATALERROR));
     DBUG_RETURN(1);
   }