into mysql.com:/space/my/mysql-4.0-build

   "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
   Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
   how we name all other packages)


Build-tools/Do-pkg:
   - PGK and DMG names now include the full arch name (e.g. 
     "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
     Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
     how we name all other packages)

client library:
- implemented 'check_license' function


include/errmsg.h:
  WL #1510: new error code
include/mysql_version.h.in:
  WL #1510: fallback define for LICENSE
libmysql/errmsg.c:
  WL #1510: error message to print in case when client and server license 
  mismatch.
libmysql/libmysql.c:
  WL#1510: implementation of 'check_license' function
sql/set_var.cc:
  removed unused variable 'license'

into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0

BitKeeper/deleted/.del-system_mysql_db.test~f5a7ec0e9440c043:
  Delete: mysql-test/t/reserv/system_mysql_db.test
BitKeeper/deleted/.del-system_mysql_db_fix.test~180b2fd4873a9c49:
  Delete: mysql-test/t/reserv/system_mysql_db_fix.test
BitKeeper/deleted/.del-system_mysql_db_fix-master.opt~2897a9ebb17f930e:
  Delete: mysql-test/t/reserv/system_mysql_db_fix-master.opt
BitKeeper/deleted/.del-system_mysql_db_refs.test~e5bffdb55190a23c:
  Delete: mysql-test/t/reserv/system_mysql_db_refs.test

into mysql.com:/home/mysql_src/mysql-4.0

with a testcase.
We needed to init_master_info before we flush_master_info
in LOAD DATA FROM MASTER.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  adding a test for RESET SLAVE + LOAD DATA FROM MASTER
sql/repl_failsafe.cc:
  LOAD DATA FROM MASTER udpates the master info in the slave,
  so needs to ensure that it is properly inited first
  (otherwise, after RESET SLAVE, we are flush_io_cache()ing
  an uninitialized IO_CACHE master.info).
  Note that it master info is already inited (active_mi->inited==1),
  init_master_info() will do nothing, which is what we want.

into teton.kitebird.com:/home/paul/mysql-4.0

innobase/btr/btr0sea.c:
  Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/btr0sea.h:
  Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/page/page0cur.c:
  Make page_rnd a static variable
  Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/page0cur.h:
  Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT

innobase/btr/btr0cur.c:
  Make btr_cur_unmark_extern_fields() a static function
innobase/include/btr0cur.h:
  Remove btr_cur_unmark_extern_fields()

BitKeeper/deleted/.del-makefilewin~f993e50b7f057fde:
  Delete: innobase/cry/makefilewin

innobase/include/que0que.h:
  Remove que_graph_is_select()
  Make que_node_print_info() a static function
innobase/include/que0que.ic:
  Remove que_graph_is_select()
innobase/que/que0que.c:
  Remove que_node_print_info() unless #ifdef UNIV_DEBUG

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

innobase/include/log0log.h:
  Remove debug variables unless #ifdef UNIV_LOG_DEBUG
innobase/include/log0log.ic:
  Remove log_check_log_recs() unless #ifdef UNIV_LOG_DEBUG
innobase/log/log0log.c:
  Remove log_debug_writes unless #ifdef UNIV_LOG_DEBUG
  log_io_complete_checkpoint(): Remove parameter; move debug output to log_io_complete(), the only caller
  Test log_debug_writes only #ifdef UNIV_LOG_DEBUG
innobase/log/log0recv.c:
  Test log_debug_writes only #ifdef UNIV_LOG_DEBUG

into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067

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

innobase/btr/btr0btr.c:
  Replace ut_a(0) with ut_error
innobase/buf/buf0flu.c:
  Replace ut_a(0) with ut_error
innobase/buf/buf0lru.c:
  Replace ut_a(0) with ut_error
innobase/data/data0data.c:
  Replace ut_a(0) with ut_error
innobase/dict/dict0crea.c:
  Replace ut_a(0) with ut_error
innobase/dict/dict0dict.c:
  Replace ut_a(0) with ut_error
innobase/dict/dict0load.c:
  Replace ut_a(0) with ut_error
innobase/fil/fil0fil.c:
  Replace ut_a(0) with ut_error
innobase/fsp/fsp0fsp.c:
  Replace ut_a(0) with ut_error
innobase/ibuf/ibuf0ibuf.c:
  Replace ut_a(0) with ut_error
innobase/include/buf0buf.ic:
  Replace ut_a(0) with ut_error
innobase/include/data0type.ic:
  Replace ut_a(0) with ut_error
innobase/include/mtr0log.ic:
  Replace ut_a(0) with ut_error
innobase/include/trx0rseg.ic:
  Replace ut_a(0) with ut_error
innobase/lock/lock0lock.c:
  Replace ut_a(0) with ut_error
innobase/log/log0log.c:
  Replace ut_a(0) with ut_error
innobase/log/log0recv.c:
  Replace ut_a(0) with ut_error
innobase/mem/mem0pool.c:
  Replace ut_a(0) with ut_error
innobase/mtr/mtr0log.c:
  Replace ut_a(0) with ut_error
innobase/os/os0file.c:
  Replace ut_a(0) with ut_error
innobase/page/page0cur.c:
  Replace ut_a(0) with ut_error
innobase/page/page0page.c:
  Replace ut_a(0) with ut_error
innobase/pars/lexyy.c:
  Replace ut_a(0) with ut_error
innobase/que/que0que.c:
  Replace ut_a(0) with ut_error
innobase/rem/rem0cmp.c:
  Replace ut_a(0) with ut_error
innobase/rem/rem0rec.c:
  Replace ut_a(0) with ut_error
innobase/row/row0ins.c:
  Replace ut_a(0) with ut_error
innobase/row/row0mysql.c:
  Replace ut_a(0) with ut_error
innobase/row/row0purge.c:
  Replace ut_a(0) with ut_error
innobase/row/row0row.c:
  Replace ut_a(0) with ut_error
innobase/row/row0sel.c:
  Replace ut_a(0) with ut_error
innobase/row/row0undo.c:
  Replace ut_a(0) with ut_error
innobase/srv/srv0srv.c:
  Replace ut_a(0) with ut_error
innobase/sync/sync0arr.c:
  Replace ut_a(0) with ut_error
innobase/trx/trx0purge.c:
  Replace ut_a(0) with ut_error
innobase/trx/trx0trx.c:
  Replace ut_a(0) with ut_error
innobase/trx/trx0undo.c:
  Replace ut_a(0) with ut_error

  Fix for a bug in the result
multi_update.test:
  Fix for a bug in the test


mysql-test/t/multi_update.test:
  Fix for a bug in the test
mysql-test/r/multi_update.result:
  Fix for a bug in the result

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

innobase/include/mem0dbg.ic:
  Disable debug functions unless #ifdef UNIV_MEM_DEBUG
innobase/mem/mem0dbg.c:
  Disable debug functions unless #ifdef UNIV_MEM_DEBUG
  Make some global variables static

into mysql.com:/home/mysql_src/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged

(--local-load alone means "I want files to be prepared for LOAD 
DATA INFILE, in the default temp directory", and mysqlbinlog already
does this without --local-load).


client/mysqlbinlog.cc:
  --local-load always needs an argument; --local-load alone is of no use.

innobase/include/mach0data.h:
  Remove mach_write() and mach_read()
innobase/include/mach0data.ic:
  Remove mach_write() and mach_read()
innobase/mem/mem0dbg.c:
  Replace mach_write() with mach_write_to_4()
  Replace mach_read() with mach_read_from_4()

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0


sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

innobase/include/ut0dbg.h:
  Remove ut_anp
  Replace fprintf with fputs
  Move string constants to .c file
innobase/ut/ut0dbg.c:
  Move string constants to .c file

mysql-test/r/func_math.result:
  Updated tests after merge with 3.23
mysql-test/r/multi_update.result:
  Fixed not portable test
mysql-test/r/mysqlbinlog.result:
  Fixed test after push without doing 'make test'
mysql-test/t/multi_update.test:
  Fixed not portable test
sql/sql_parse.cc:
  Don't use static inline, as this is not portable

mysql-test/install_test_db.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  SCCS merged

BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
sql/item_func.cc:
  Auto merged

Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.


extra/replace.c:
  Fix comments
mysql-test/install_test_db.sh:
  Change internal option from -bin to --bin
  Ensure that script works with both 'make install' and 'make_binary_distribution' layouts (Bug #3031)
mysql-test/mysql-test-run.sh:
  Change internal option from -bin to --bin
sql/ha_berkeley.cc:
  More debug
sql/mysql_priv.h:
  Change table_cache_init to return error
sql/mysqld.cc:
  Abort if we can't allocate memory for table cache. (Bug #3085)
  Enable warnings by default
sql/sql_base.cc:
  Change table_cache_init to return error
sql/sql_update.cc:
  Fix bug with multi-update-tables and BDB tables. Bug #3098
  Problem was that we didn't initialize BDB for calls to rnd_pos()

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

innobase/include/data0data.h:
  dtuple_struct:magic_n: Enclose in #ifdef UNIV_DEBUG
innobase/dict/dict0dict.c:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/dict/dict0mem.c:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/ha/hash0hash.c:
  Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all
  Use magic_n only #ifdef UNIV_DEBUG
  Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N)
innobase/include/dict0mem.h:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/include/hash0hash.h:
  Remove unused functions hash_mutex_enter_all and hash_mutex_exit_all
  Use magic_n only #ifdef UNIV_DEBUG
innobase/include/hash0hash.ic:
  Add ut_ad(table->magic_n == HASH_TABLE_MAGIC_N)
innobase/include/mtr0mtr.h:
  Use state, magic_n only #ifdef UNIV_DEBUG
innobase/include/row0ins.h:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/include/row0upd.h:
  Use magic_n only #ifdef UNIV_DEBUG
innobase/row/row0ins.c:
  Use magic_n only #ifdef UNIV_DEBUG
  Add ut_ad(node->magic_n == INS_NODE_MAGIC_N)
innobase/row/row0upd.c:
  Use magic_n only #ifdef UNIV_DEBUG
  Add ut_ad(node->magic_n == UPD_NODE_MAGIC_N)
innobase/thr/thr0loc.c:
  Use magic_n only #ifdef UNIV_DEBUG