bzr commit into mysql-6.0-opt-subqueries branch (sergefp:2702)

[Sergey Petrunia]

#At file:///home/spetrunia/dev/mysql-7.0-subq-r17-xpl/

 2702 Sergey Petrunia	2008-10-16
      Trivial post-merge fix: Keep definitions RECORD::copy_field[_end] in struct record.
modified:
  sql/records.h
  sql/structs.h

per-file messages:
  sql/records.h
    Trivial post-merge fix: Keep definitions RECORD::copy_field[_end] in struct record.
  sql/structs.h
    Trivial post-merge fix: Keep definitions RECORD::copy_field[_end] in struct record.
=== modified file 'sql/records.h'
--- a/sql/records.h	2008-09-12 09:09:27 +0000
+++ b/sql/records.h	2008-10-16 00:20:10 +0000
@@ -25,6 +25,7 @@ class handler;
 struct TABLE;
 class THD;
 class SQL_SELECT;
+class Copy_field;
 
 /**
   A context for reading through a single table using a chosen access method:
@@ -62,6 +63,13 @@ struct READ_RECORD
   bool print_error, ignore_not_found_rows;
   struct st_join_table *do_insideout_scan;
 
+  /* 
+    SJ-Materialization runtime may need to read fields from the materialized
+    table and unpack them into original table fields:
+  */
+  Copy_field *copy_field;
+  Copy_field *copy_field_end;
+
 public:
   READ_RECORD() {}
 };

=== modified file 'sql/structs.h'
--- a/sql/structs.h	2008-10-15 23:14:03 +0000
+++ b/sql/structs.h	2008-10-16 00:20:10 +0000
@@ -118,13 +118,6 @@ typedef struct st_reginfo {		/* Extra in
 
 class Copy_field;
 
-  /* 
-    SJ-Materialization runtime may need to read fields from the materialized
-    table and unpack them into original table fields:
-  */
-  Copy_field *copy_field;
-  Copy_field *copy_field_end;
-
 /*
   Originally MySQL used MYSQL_TIME structure inside server only, but since
   4.1 it's exported to user in the new client API. Define aliases for