Fix for BUG#5837 merged from 4.0

sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

1 files changed, 8 insertions, 2 deletions

diff --git a/sql/table.h b/sql/table.h
index 2eb854f553d..eed9969dac8 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -131,8 +131,14 @@ struct st_table {
   int current_lock;			/* Type of lock on table */
   enum tmp_table_type tmp_table;
   my_bool copy_blobs;			/* copy_blobs when storing */
-  my_bool null_row;			/* All columns are null */
-  my_bool maybe_null,outer_join;	/* Used with OUTER JOIN */
+  /*
+    Used in outer joins: if true, all columns are considered to have NULL
+    values, including columns declared as "not null".
+  */
+  my_bool null_row;
+  /* 0 or JOIN_TYPE_{LEFT|RIGHT}, same as TABLE_LIST::outer_join */
+  my_bool outer_join;
+  my_bool maybe_null;                   /* true if (outer_join != 0) */
   my_bool force_index;
   my_bool distinct,const_table,no_rows;
   my_bool key_read;