bk commit into 5.1 tree (msvensson:1.2179) BUG#20018

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2179 06/05/23 09:25:07 msvensson@neptunus.(none) +1 -0
  Bug#20018 Class declared inside of function causes problem with gcc 2.95.3
   - Move class MY_HOOKS out of function

  sql/sql_insert.cc
    1.201 06/05/23 09:24:59 msvensson@neptunus.(none) +13 -13
    Move class MY_HOOKS out of function 'select_create::prepare'

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-release

--- 1.200/sql/sql_insert.cc	2006-05-18 13:35:11 +02:00
+++ 1.201/sql/sql_insert.cc	2006-05-23 09:24:59 +02:00
@@ -2674,23 +2674,23 @@
 }
 
 
+class MY_HOOKS : public TABLEOP_HOOKS {
+public:
+  MY_HOOKS(select_create *x) : ptr(x) { }
+  virtual void do_prelock(TABLE **tables, uint count)
+  {
+    if (ptr->get_thd()->current_stmt_binlog_row_based)
+      ptr->binlog_show_create_table(tables, count);
+  }
+
+private:
+  select_create *ptr;
+};
+
 int
 select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
 {
   DBUG_ENTER("select_create::prepare");
-
-  class MY_HOOKS : public TABLEOP_HOOKS {
-  public:
-    MY_HOOKS(select_create *x) : ptr(x) { }
-    virtual void do_prelock(TABLE **tables, uint count)
-    {
-      if (ptr->get_thd()->current_stmt_binlog_row_based)
-        ptr->binlog_show_create_table(tables, count);
-    }
-
-  private:
-    select_create *ptr;
-  };
 
   MY_HOOKS hooks(this);