Commit 9352be77 authored by unknown's avatar unknown
Browse files

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
parents e53f3aac b95f1073

myisam/mi_packrec.c

+1 −2
Original line number Diff line number Diff line
@@ -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. */