- Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable


innobase/include/srv0srv.h:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
innobase/srv/srv0srv.c:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
mysql-test/r/innodb.result:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
mysql-test/t/innodb.test:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/ha_innodb.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/ha_innodb.h:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/mysqld.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
sql/set_var.cc:
  - Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable

  Create new innodb_sync_spin_loops variable


mysql-test/r/innodb.result:
  Create new innodb_sync_spin_loops variable
mysql-test/t/innodb.test:
  Create new innodb_sync_spin_loops variable
sql/ha_innodb.h:
  Create new innodb_sync_spin_loops variable
sql/mysqld.cc:
  Create new innodb_sync_spin_loops variable
sql/set_var.cc:
  Create new innodb_sync_spin_loops variable

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

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

instead of DATADIR.


include/config-win.h:
  Added checks for environment variable MYSQL_HOME
libmysql/Makefile.shared:
  Added checks for environment variable MYSQL_HOME
mysys/Makefile.am:
  Added checks for environment variable MYSQL_HOME
mysys/default.c:
  Removed checks for my.cnf file in datadir, instead added checking
  if my.cnf exists in environment variable MYSQL_HOME
scripts/mysqld_multi.sh:
  Added checks for my.cnf file in environment variable MYSQL_HOME,
  if exists.
scripts/mysqld_safe.sh:
  Added checks for my.cnf file in environment variable MYSQL_HOME,
  if exists.

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

into mysql.com:/M50/mysql-5.0

sql/sql_acl.cc:
  block checking view underlying tables
sql/sql_base.cc:
  item registration fixed
  fixed non registred item resolving
  fixed result of outo-merge
  fixed creation reference if alias used
sql/sql_insert.cc:
  layout fixed
  removed unused variable
sql/sql_parse.cc:
  block checking view underlying tables
sql/sql_prepare.cc:
  make preparation check same as usual check
sql/sql_update.cc:
  made want_privilege assignment simplier
  block checking view underlying tables
sql/sql_view.cc:
  belong_to_view assignmebt moved after privileges check
sql/table.cc:
  check option fix field added
  arena management added

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

Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results


libmysql/libmysql.c:
  Add support for warnings for prepare of prepared statements
mysql-test/r/func_concat.result:
  After merge fixes
mysql-test/r/select.result:
  Delete conflicting tables form previous tests
mysql-test/r/view.result:
  New code from 4.1 fixed old error
mysql-test/t/create.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/func_group.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/func_time.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/having.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/insert_select.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/select.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/sp.test:
  Fixed comment
mysql-test/t/system_mysql_db_fix.test:
  Fix that results is same as from system_mysql_db.test
mysql-test/t/trigger.test:
  Added comment
mysql-test/t/type_blob.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/union.test:
  Run most of the test with --ps-protocol
mysql-test/t/user_limits.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/view.test:
  Removed --error as bug is now fixed
mysql-test/t/warnings.test:
  Ensure that --ps-protocol return same results as normal test
ndb/include/Makefile.am:
  Don't automaticly use SCCS files
sql/ha_ndbcluster.cc:
  Removed compiler warning
sql/log_event.cc:
  After merge fix
sql/sql_class.h:
  After merge fix
sql/sql_insert.cc:
  After merge fix
sql/sql_load.cc:
  After merge fix
sql/sql_prepare.cc:
  Add support for warnings for prepare of prepared statements
sql/sql_update.cc:
  After merge fixes

mysql-test/t/multi_update.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

    Install varchar.frm
    Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh
    Use correct path to clist_tests in on installed system


mysql-test/Makefile.am:
  Install varchar.frm
  Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh:
  Use correct path to clist_tests in on installed system

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


sql/sql_base.cc:
  Auto merged

into mysql.com:/users/pchardin/mysql-5.0

BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Delete: man/isamlog.1.in
man/Makefile.am:
  man pages for isamchk and isamlog removed
support-files/mysql.spec.sh:
  fix .spec file after isam/merge purge

    don't fail w/o bdb (or innodb)
sql/sql_base.cc
    typo fixed.
    "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)


mysql-test/r/multi_update.result:
  don't fail w/o bdb (or innodb)
mysql-test/t/multi_update.test:
  don't fail w/o bdb (or innodb)
sql/sql_base.cc:
  typo fixed.
  "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)

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

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

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
innobase/row/row0upd.c:
  Trivial merge
mysql-test/t/func_concat.test:
  Keep local code
mysql-test/t/multi_update.test:
  auto merge
sql/ha_ndbcluster.cc:
  manual merge
sql/item_timefunc.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/sql_class.h:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_lex.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_load.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/sql_update.cc:
  manual merge

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


Build-tools/Bootstrap:
  Auto merged

into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0

  ChangeLog, too (to be more exact when tagging a release that's based on a
  merge ChangeSet)


Build-tools/Bootstrap:
  - include merge ChangeSets into the ChangeLog, too (to be more exact when
    tagging a release that's based on a merge ChangeSet)

  Fix Bug#7624


innobase/include/sync0rw.h:
  Fix Bug#7624
innobase/include/sync0sync.h:
  Fix Bug#7624

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

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

BitKeeper/etc/ignore:
  added ndb/include/ndb_global.h ndb/include/ndb_version.h

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

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


mysql-test/t/multi_update.test:
  Auto merged

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


ndb/include/ndb_global.h.in:
  Auto merged

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


ndb/include/ndb_global.h.in:
  Auto merged
ndb/include/ndb_types.h:
  Auto merged

ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in

This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests


mysql-test/r/mysqldump.result:
  Safety fix if a previous test would fail
mysql-test/r/show_check.result:
  Safety fix if a previous test would fail
mysql-test/r/sp.result:
  Fix for --ps-protocol
mysql-test/r/synchronization.result:
  Safety fix if a previous test would fail
mysql-test/r/system_mysql_db.result:
  Safety fix if a previous test would fail
mysql-test/t/mysqldump.test:
  Safety fix if a previous test would fail
mysql-test/t/select.test:
  Safety fix if a previous test would fail
mysql-test/t/show_check.test:
  Safety fix if a previous test would fail
mysql-test/t/sp.test:
  fix for --ps-protocol
mysql-test/t/strict.test:
  Fix for --ps-protocol
mysql-test/t/synchronization.test:
  Safety fix if a previous test would fail
mysql-test/t/system_mysql_db.test:
  Safety fix if a previous test would fail
sql/item_sum.cc:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/item_sum.h:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/mysql_priv.h:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_base.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_insert.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_parse.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_prepare.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_select.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_union.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_update.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/table.h:
  Better handling of ensuring that setup_tables() are not called twice

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


ndb/include/ndb_types.h:
  Auto merged

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