diff options
| author | ingo@mysql.com <> | 2005-12-06 08:19:23 +0100 |
|---|---|---|
| committer | ingo@mysql.com <> | 2005-12-06 08:19:23 +0100 |
| commit | a588622a6629b06bb931a20b935eed8663aaa7c1 (patch) | |
| tree | 9530fa14d582e2d7bea51044d6c472f09c97c210 /sql | |
| parent | 56e35734c20f2ce8130635c732ba92b68cbbd234 (diff) | |
| parent | 6b18dbef3163f5c99d35852421d909cf3a7651bd (diff) | |
| download | mariadb-git-a588622a6629b06bb931a20b935eed8663aaa7c1.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug10932
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 6 | ||||
| -rw-r--r-- | sql/opt_range.cc | 1 | ||||
| -rw-r--r-- | sql/unireg.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 6a1a65b963a..9b7921b2179 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -42,7 +42,11 @@ /* TODO convert all these three maps to Bitmap classes */ typedef ulonglong table_map; /* Used for table bits in join */ -typedef Bitmap<64> key_map; /* Used for finding keys */ +#if MAX_INDEXES <= 64 +typedef Bitmap<64> key_map; /* Used for finding keys */ +#else +typedef Bitmap<((MAX_INDEXES+7)/8*8)> key_map; /* Used for finding keys */ +#endif typedef ulong key_part_map; /* Used for finding key parts */ /* Used to identify NESTED_JOIN structures within a join (applicable only to diff --git a/sql/opt_range.cc b/sql/opt_range.cc index d9a608eb064..221a343053d 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3172,6 +3172,7 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param, trp->is_covering= TRUE; trp->read_cost= total_cost; trp->records= records; + trp->cpk_scan= NULL; DBUG_PRINT("info", ("Returning covering ROR-intersect plan: cost %g, records %lu", diff --git a/sql/unireg.h b/sql/unireg.h index 40499261a4d..b932a2f320c 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -48,7 +48,7 @@ #define MAX_ALIAS_NAME 256 #define MAX_FIELD_NAME 34 /* Max colum name length +2 */ #define MAX_SYS_VAR_LENGTH 32 -#define MAX_KEY 64 /* Max used keys */ +#define MAX_KEY MAX_INDEXES /* Max used keys */ #define MAX_REF_PARTS 16 /* Max parts used as ref */ #define MAX_KEY_LENGTH 3072 /* max possible key */ #if SIZEOF_OFF_T > 4 |