diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-17 12:14:34 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-17 12:14:34 +0100 |
| commit | a2649023a447400508a357b10b2c2d7c847d1a63 (patch) | |
| tree | ae282d37761d6f38e0826796dc197fcbd221f908 /myisam | |
| parent | bd6afc39ed1d6ad04ede299d694bbfa8df79c286 (diff) | |
| parent | 53819667872dea6f29257981a6fe4d1071d4603e (diff) | |
| download | mariadb-git-a2649023a447400508a357b10b2c2d7c847d1a63.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
myisam/mi_packrec.c:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/my_read.c:
Auto merged
mysys/my_seek.c:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_packrec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index 37614cc1e1f..6df64ae2cd4 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -591,8 +591,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits, static uint copy_decode_table(uint16 *to_pos, uint offset, uint16 *decode_table) { - uint prev_offset; - prev_offset= offset; + uint prev_offset= offset; DBUG_ENTER("copy_decode_table"); /* Descent on the left side. */ |