Commit 9352be77 authored by unknown's avatar unknown

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
...@@ -591,8 +591,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits, ...@@ -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, static uint copy_decode_table(uint16 *to_pos, uint offset,
uint16 *decode_table) uint16 *decode_table)
{ {
uint prev_offset; uint prev_offset= offset;
prev_offset= offset;
DBUG_ENTER("copy_decode_table"); DBUG_ENTER("copy_decode_table");
/* Descent on the left side. */ /* Descent on the left side. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment