diff options
| author | unknown <hf@deer.(none)> | 2005-07-27 12:56:23 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-07-27 12:56:23 +0500 |
| commit | 0f11b91bd5d7b91625ff24e49e9922dd6ae7a516 (patch) | |
| tree | a770459346012a6cdeaca3553e0059a1fb83fd59 /libmysqld | |
| parent | 06bb44f7c9434d314c9b2fa3a8b22c2af4f062c2 (diff) | |
| parent | 3c9090b3ddd0640a25f4a9b5f1998ff0ca60f987 (diff) | |
| download | mariadb-git-0f11b91bd5d7b91625ff24e49e9922dd6ae7a516.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-4.1.9110
into deer.(none):/home/hf/work/mysql-5.0.clean
libmysqld/lib_sql.cc:
Auto merged
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 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; |