diff options
| author | unknown <istruewing@stella.local> | 2007-11-26 15:38:29 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-26 15:38:29 +0100 |
| commit | 9b6093020b716ba96f5abee21db3af2241076c0c (patch) | |
| tree | 1ba00c5e295a5d415662f575083660c370483fdb /storage/myisam/mi_packrec.c | |
| parent | c20245d2e7026de481502e0ca05de7dfe8cbea9e (diff) | |
| parent | af34d3577ece90dc4c47c0ff36b08bef9b6401e0 (diff) | |
| download | mariadb-git-9b6093020b716ba96f5abee21db3af2241076c0c.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
storage/myisam/mi_packrec.c:
Auto merged
mysql-test/t/disabled.def:
Manual merge from 5.0
Diffstat (limited to 'storage/myisam/mi_packrec.c')
| -rw-r--r-- | storage/myisam/mi_packrec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c index 70904aa2a27..59c98c978ce 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -564,7 +564,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits, */ value|= (max_bits - bits) << 8 | IS_CHAR; - for (end= table + (uint) (((uint) 1 << bits)); table < end; table++) + for (end= table + ((my_ptrdiff_t) 1 << bits); table < end; table++) { *table= (uint16) value; } |