Merge deer.(none):/home/hf/work/mysql-4.1.9110

into deer.(none):/home/hf/work/mysql-5.0.clean

Merge deer.(none):/home/hf/work/mysql-4.1.9110
into deer.(none):/home/hf/work/mysql-5.0.clean
41c83870 · hf@deer.(none) · f2944dca · a18855bf · 41c83870
Commit 41c83870 authored Jul 27, 2005 by hf@deer.(none)
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +2 -0

No files found.
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -502,6 +502,8 @@ void *create_embedded_thd(int client_flag, char *db)
 /* 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;