diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-11 02:00:51 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-11 02:00:51 +0500 |
| commit | 6aa5fa3a1dbbee863fb4a0da153cedff6b69a418 (patch) | |
| tree | 2380b8a509f41895330745de2a1f4255304c4929 /sql/unireg.h | |
| parent | 6930ac54068b88ce5ca2476f70d74ddb42f5d9fc (diff) | |
| parent | 124ad307e3306fc1de749234b7a4e7708f620d57 (diff) | |
| download | mariadb-git-6aa5fa3a1dbbee863fb4a0da153cedff6b69a418.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_select.cc:
Merge with main tree.
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 232ea5e70e7..b368eee6f0e 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -85,6 +85,8 @@ #define MAX_FIELDS 4096 /* Limit in the .frm file */ #define MAX_PARTITIONS 1024 +#define MAX_SELECT_NESTING (sizeof(nesting_map)*8-1) + #define MAX_SORT_MEMORY (2048*1024-MALLOC_OVERHEAD) #define MIN_SORT_MEMORY (32*1024-MALLOC_OVERHEAD) |