summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authortsmith@siva.hindu.god <>2007-01-18 08:41:52 -0700
committertsmith@siva.hindu.god <>2007-01-18 08:41:52 -0700
commit94f7990ef8bb8972ead00791937116f591837a55 (patch)
treefa97f35dee68f54abce23ee236b0e1a371ba7c74 /storage
parentcc7afe24947a687df41f757c2014ac6e90897710 (diff)
parent2ae081e041dfe5d7cb60a0663de288d05e4280c4 (diff)
downloadmariadb-git-94f7990ef8bb8972ead00791937116f591837a55.tar.gz
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/mi_packrec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index ba16d2c8c9b..30c95dcb0bd 100644
--- a/storage/myisam/mi_packrec.c
+++ b/storage/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. */