summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <istruewing@chilla.local>2007-01-29 17:20:18 +0100
committerunknown <istruewing@chilla.local>2007-01-29 17:20:18 +0100
commitd308799383bdbcaad568c9844b34708462dd74e7 (patch)
tree9ecca7943a964140be08bdfb8a54f9b76b89e592 /myisam
parent9403c7ca67535aa2a7610c4887b6e9276f5cb333 (diff)
parentfddf3c397913f3254bd2adf0d1d7ad4cde586355 (diff)
downloadmariadb-git-d308799383bdbcaad568c9844b34708462dd74e7.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into chilla.local:/home/mydev/mysql-4.1-axmrg mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/r/myisam.result: Manual merged mysql-test/t/myisam.test: Manual merged
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_packrec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c
index 5363a3ecf23..51b0222e876 100644
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.c
@@ -590,8 +590,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. */