diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:15:21 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-03 02:15:21 +0500 |
| commit | bba712a6c8ccab1faa8c6deaf62117c5d6a69495 (patch) | |
| tree | c3533e82d947e58c3e943074ef1781a098306c50 /sql/unireg.h | |
| parent | cb3df6f2e9f286fceca4a4a0e125642e52baf342 (diff) | |
| parent | cf145f8f425d8cf1fe86ceae7cb049ef5d01b2ea (diff) | |
| download | mariadb-git-bba712a6c8ccab1faa8c6deaf62117c5d6a69495.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/share/errmsg.txt:
Merge with 5.0-opt.
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 6c26f30f116..29daee27617 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) |