diff options
author | unknown <hf@deer.(none)> | 2005-07-27 12:54:32 +0500 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2005-07-27 12:54:32 +0500 |
commit | 92ded49855525dd82d0fcf77eb4d53f6f01d64c3 (patch) | |
tree | 009cd403914bd5f4e91fe407bb3cebce6b4bc626 /libmysqld | |
parent | 65b02ad5ce12e2047684afc172ce9975a1afbc15 (diff) | |
parent | 19117503544af34ad492286351ded5f60cbf5854 (diff) | |
download | mariadb-git-92ded49855525dd82d0fcf77eb4d53f6f01d64c3.tar.gz |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9110
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 15fe3a03390..82e1c19d758 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -506,6 +506,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; |