bug#7660

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

(Bug#7428) (renamed: hash_reset -> my_hash_reset)

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/mysql_src/mysql-4.1-clean

A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE).

  Fix compiler error on those OS X platforms where Apple's special file flush trick with fcntl() is not defined

into mysql.com:/home/mysql_src/mysql-4.1-clean

mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.

into mysql.com:/home/jonas/src/mysql-4.1

  Whack duplicate variable line. (Affects SHOW VARIABLES.)

format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556)

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/jwinstead2/mysql-4.1-clean

  Reorder variables to properly alphabetize SHOW VARIABLES output.

with a number of decimals specified. (Bug #7361)

  Change mode to -rw-rw----

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

  installation disk images