diff options
| author | Leonard Zhou <leonard@mysql.com> | 2009-03-24 15:29:04 +0800 |
|---|---|---|
| committer | Leonard Zhou <leonard@mysql.com> | 2009-03-24 15:29:04 +0800 |
| commit | dad07ffe9ed5711b66d86d18d9cdf814f472d49a (patch) | |
| tree | 28a35254e0bc06cde57ecc5bfb2c40e5e9d9e6fa /sql/sql_class.cc | |
| parent | 5fdc5510ec1abcfe3f3f74a229ae3102533f46c4 (diff) | |
| parent | fbb90c66d79fcb221589ba5907e20b923d5deacf (diff) | |
| download | mariadb-git-dad07ffe9ed5711b66d86d18d9cdf814f472d49a.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 4ea621f428d..74bc669a049 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -343,6 +343,12 @@ void THD::init(void) if (variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) server_status|= SERVER_STATUS_NO_BACKSLASH_ESCAPES; options= thd_startup_options; + + if (variables.max_join_size == HA_POS_ERROR) + options |= OPTION_BIG_SELECTS; + else + options &= ~OPTION_BIG_SELECTS; + transaction.all.modified_non_trans_table= transaction.stmt.modified_non_trans_table= FALSE; open_options=ha_open_options; update_lock_default= (variables.low_priority_updates ? @@ -1752,7 +1758,7 @@ void Query_arena::set_query_arena(Query_arena *set) void Query_arena::cleanup_stmt() { - DBUG_ASSERT("Query_arena::cleanup_stmt()" == "not implemented"); + DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented"); } /* |