bk commit into 4.1 tree (hf:1.2344) BUG#9110

[holyfoot]

Below is the list of changes that have just been committed into a local
4.1 repository of hf. When hf 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.2344 05/07/26 12:08:00 hf@deer.(none) +1 -0
  Fix for bug #9110 (Max_join_size error)

  libmysqld/lib_sql.cc
    1.123 05/07/26 12:07:20 hf@deer.(none) +2 -0
    This should be done during the thread activation

# 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:	hf
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-4.1.9110

--- 1.122/libmysqld/lib_sql.cc	Tue Jan 11 18:37:49 2005
+++ 1.123/libmysqld/lib_sql.cc	Tue Jul 26 12:07:20 2005
@@ -506,6 +506,8 @@
 
 /* TODO - add init_connect command execution */
 
+  if (thd->variables.max_join_size == HA_POS_ERROR)
+    thd->options |= OPTION_BIG_SELECTS;
   thd->proc_info=0;				// Remove 'login'
   thd->command=COM_SLEEP;
   thd->version=refresh_version;