summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorhf@deer.(none) <>2005-07-27 12:56:23 +0500
committerhf@deer.(none) <>2005-07-27 12:56:23 +0500
commit41c83870a26627ffd4b53ff1b13f4a394df3f51b (patch)
treea770459346012a6cdeaca3553e0059a1fb83fd59 /libmysqld
parentf2944dca2a5dcabd9e39cb0e3d927055ae4d3d7d (diff)
parenta18855bfc592ef74465b51bb760a272dd01ea4fb (diff)
downloadmariadb-git-41c83870a26627ffd4b53ff1b13f4a394df3f51b.tar.gz
Merge deer.(none):/home/hf/work/mysql-4.1.9110
into deer.(none):/home/hf/work/mysql-5.0.clean
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index c3b239ac7b9..a86d467299c 100644
--- 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;