Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-update-5.0


sql/sql_prepare.cc:
  Auto merged

1 files changed, 6 insertions, 2 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index fcaebe64b43..0da77d5636a 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1131,8 +1131,12 @@ public:
   {
     return command == COM_PREPARE;
   }
-  inline gptr trans_alloc(unsigned int size) 
-  { 
+  inline bool fill_derived_tables()
+  {
+    return !only_prepare() && !lex->only_view_structure();
+  }
+  inline gptr trans_alloc(unsigned int size)
+  {
     return alloc_root(&transaction.mem_root,size);
   }