bzr commit into mysql-6.0-runtime branch (alik:2760)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/wl4264/6.0-rt-wl4264.2/

 2760 Alexander Nozdrin	2008-12-04
      1. Fix Database_item_obj::drop() implementation
      2. Polishing.
modified:
  sql/si_objects.cc

=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2008-12-02 14:41:41 +0000
+++ b/sql/si_objects.cc	2008-12-04 13:37:53 +0000
@@ -930,7 +930,8 @@ protected:
 void Database_item_obj::build_drop_statement(String_stream &s_stream) const
 {
   s_stream <<
-    "DROP " << get_type_name() << " IF EXISTS `" << get_name() <<
"`";
+    "DROP " << get_type_name() << " IF EXISTS `" <<
+    get_db_name() << "`.`" << get_name() << "`";
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -1617,12 +1618,9 @@ bool View_base_obj_iterator::init(THD *t
                                           db_name, view_name);
   Ed_result ed_result; /* Just to grab OK or ERROR */
 
-  if (mysql_execute_direct(thd, &find_tables, &ed_result))
-    return TRUE;
-
   /* The table list is filled with unique underlying table names. */
 
-  return FALSE;
+  return mysql_execute_direct(thd, &find_tables, &ed_result);
 }
 
 ///////////////////////////////////////////////////////////////////////////