Shouldn't be moved to 4.1


myisam/mi_check.c:
  only set key_map if necessary

into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0


mysys/default.c:
  Auto merged

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

BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Delete: VC++Files/libmysql/libmysql.def
VC++Files/innobase/innobase.dsp:
  'com' module no longer exists.
VC++Files/strings/MASM6x/strings.dsp:
  Add strnlen
VC++Files/strings/strings.dsp:
  Add strnlen

  Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically


innobase/sync/sync0sync.c:
  Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically

into hundin.mysql.fi:/home/heikki/mysql-4.0

  Fix typo __NETWARE --> __NETWARE__ in mutex creation


innobase/sync/sync0sync.c:
  Fix typo __NETWARE --> __NETWARE__ in mutex creation

test="\"#no comment here"#real comment

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

this is better in this case:
- imagine user1 has created a temp table
- imagine user2 does FLUSH TABLES WITH READ LOCK, then takes a backup,
then RESET MASTER then UNLOCK TABLES, like mysqldump --first-slave
- then in the binlog you will finally have the DROP TEMPORARY TABLE,
but not the CREATE TEMPORARY TABLE, so when you later restore with
mysqlbinlog|mysql, mysql will complain that table does not exist.
Replication was already protected of this (it processes DROP TEMPORARY
TABLE as if there was a IF EXISTS), now I add it directly to the query
for mysqlbinlog|mysql to work.


mysql-test/r/drop_temp_table.result:
  result update (query changed)

  Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key


innobase/btr/btr0btr.c:
  Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key

  Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record


innobase/btr/btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
innobase/btr/btr0btr.c:
  Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key

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

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)

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

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

Fixed some wrong column specifications in mysql_fix_privilege_tables


mysql-test/mysql-test-run.sh:
  Portability fix
mysql-test/r/func_math.result:
  portability fix
mysql-test/r/rpl_error_ignored_table.result:
  portability fix
mysql-test/t/func_math.test:
  portability fix
mysql-test/t/rpl_error_ignored_table.test:
  portability fix
scripts/mysql_fix_privilege_tables.sh:
  func.name was not generated correctly
scripts/mysql_fix_privilege_tables.sql:
  Fixed some wrong column specifications

scripts/mysql_install_db.sh:
  typo fixed
  (thanks Alex Dupre <ale@FreeBSD.org> for noticing this!)

Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work


client/mysqltest.c:
  More debug information
innobase/que/que0que.c:
  Fixed wrong usage of __attribute
mysql-test/mysql-test-run.sh:
  Portability fix; Added CLIENT_BINDIR
mysql-test/t/system_mysql_db_fix.test:
  Removed \r
mysql-test/t/system_mysql_db_refs.test:
  Removed \r
scripts/mysql_fix_privilege_tables.sh:
  Don't set root password from first option
  Added --bindir option

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

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 mysql.com:/home/my/mysql-4.0

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

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()

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

Increase max size of number of elements in key. This fixed a bug when using count(DISTINCT) with lot of distinct values and big 'max_heap_table_size'

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