diff options
| author | unknown <monty@mysql.com> | 2005-02-07 19:42:03 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-07 19:42:03 +0200 |
| commit | 4d250e6c49bd72a836b739b8a0e46f7b87b2da6c (patch) | |
| tree | 5c11adf8670fa1044233b655ddda407c614e763a /sql/unireg.h | |
| parent | cec86712de2d9f5c4722e5b2cacb12d8485c2543 (diff) | |
| parent | 62b19904d2d2cc414d97fd48f8fbdeedc0bdbe91 (diff) | |
| download | mariadb-git-4d250e6c49bd72a836b739b8a0e46f7b87b2da6c.tar.gz | |
Merge with 4.1 to get bug fix
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/item_cmpfunc.cc:
manual merge
sql/item_func.cc:
no changes
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 eca540b61b9..8d88683241b 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -77,6 +77,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) |