Add dummy changelog file. It should merge upward without conflict.

  dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.


innobase/dict/dict0load.c:
  dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.

mysql-test/r/mysqldump.result:
  Fix for avoiding version text
mysql-test/t/mysqldump.test:
  Fix for avoiding version text

innobase/dict/dict0load.c:
  dict_load_table():
  Display diagnostic output if mix_len differs from 0.

  dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.


innobase/dict/dict0load.c:
  dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.

into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged

into mysql.com:/M41/mysql-4.1

into hundin.mysql.fi:/home/marko/k/mysql-4.0

Build-tools/Do-compile:
  Post-merge manual fix: Avoid the duplicate line.

Build-tools/Do-compile:
  Change in 4.0 was backport, no effect on 4.1
configure.in:
  No change in 4.1 on merging.
sql/item_strfunc.cc:
  No change in 4.1

- bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
  as 4.0.24)


configure.in:
  - bumped up version number from 4.0.24 -> 4.0.25

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

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

correct the definition of srv_max_buf_pool_modified_pct.


innobase/include/srv0srv.h:
  Declare srv_max_buf_pool_modified_pct
innobase/srv/srv0srv.c:
  Define srv_max_buf_pool_modified_pct as ulong,
  as it is declared in ha_innodb.h.

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498

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

Build-tools/Do-compile:
  Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
  
  Improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

into hundin.mysql.fi:/home/marko/mysql-4.1

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

  Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()


innobase/trx/trx0trx.c:
  Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()

  added skip-ndbcluster switch


mysql-test/mysql-test-run.sh:
  added skip-ndbcluster switch

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

sql/mysqld.cc:
  mark the thread as killed in close_connection
sql/protocol.cc:
  don't bother remembering warnings if the thread is dying

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1

VC++Files/client/mysqladmin_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqldump_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqlimport_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqlshow_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqltest_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/comp_err/comp_err_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/isamchk/isamchk_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysql/libmysql_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqld/libmysqld_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqltest/myTest_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/my_print_defaults/my_print_defaults_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisamchk/myisamchk_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisamlog/myisamlog_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisampack/myisampack_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysql_ia64.dsw:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
  Changed project order (dependency doesn't work with platform SDK)
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlmanager/MySqlManager_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlwatch/mysqlwatch_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/pack_isam/pack_isam_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/perror/perror_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/replace/replace_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/sql/mysqld_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/sql/mysqldmax_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/strings/strings_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/test1/test1_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/tests/mysql_client_test_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/thr_test/thr_test_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)

into mysql.com:/M41/mysql-4.1

innobase/buf/buf0lru.c:
  Portability fix: Use %p for printing pointers
innobase/dict/dict0dict.c:
  Properly cast the arguments of toupper()
innobase/eval/eval0proc.c:
  Declare loop_var_value with a matching data type.
innobase/include/mem0mem.ic:
  Remove implicit type conversion
innobase/include/page0page.ic:
  Portability fix: Use %p for printing pointers
innobase/include/pars0pars.h:
  Remove implicit type conversion
innobase/include/pars0sym.h:
  Remove implicit type conversion
innobase/mem/mem0dbg.c:
  Portability fix: Use %p for printing pointers
innobase/os/os0file.c:
  Add DWORD casts for Windows
innobase/os/os0sync.c:
  Add DWORD casts for Windows
innobase/os/os0thread.c:
  Add DWORD casts for Windows
innobase/rem/rem0cmp.c:
  Make implicit type conversions explicit
innobase/row/row0mysql.c:
  Make implicit type conversions explicit
innobase/row/row0sel.c:
  Portability fix: Use %p for printing pointers
innobase/trx/trx0sys.c:
  Declare trx_sys_mysql_bin_log_pos_high and
  trx_sys_mysql_bin_log_pos_low with a matching data type
innobase/ut/ut0ut.c:
  Make implicit type conversion explicit

object version after dropping index

mysys/my_bitmap.c:
  Resolved merge conflict (identical change in 4.0 and 4.1).

include/my_sys.h:
  Auto merged
mysys/hash.c:
  Manually merged: 'static' for all, 'inline' for most platforms.