diff options
| author | unknown <monty@mysql.com> | 2005-02-07 18:14:31 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-07 18:14:31 +0200 |
| commit | edae64f4cb319562bc9f6ea0a20b6cfe174fdaff (patch) | |
| tree | 52bd15591cacd4fcb417957f538bc26953ef3025 /sql/unireg.h | |
| parent | 4a196cc4d3ef589d5d2aa1b39e31ff6ab82ac271 (diff) | |
| parent | d6ed8cd7097391b55936a1dfec248da65e7f64f9 (diff) | |
| download | mariadb-git-edae64f4cb319562bc9f6ea0a20b6cfe174fdaff.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
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 4ab2ba26b15..70df9a89c8f 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -72,6 +72,8 @@ #define PARAM_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-3)) #define OUTER_REF_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-2)) #define RAND_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-1)) +#define PSEUDO_TABLE_BITS (PARAM_TABLE_BIT | OUTER_REF_TABLE_BIT | \ + RAND_TABLE_BIT) #define MAX_FIELDS 4096 /* Limit in the .frm file */ #define MAX_SORT_MEMORY (2048*1024-MALLOC_OVERHEAD) |