into mysql.com:/home/wax/mysql/mysql-4.1group_concat

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

BitKeeper/etc/ignore:
  added ndb/src/cw/cpcd/ndb_cpcd ndb/src/kernel/ndbd ndb/src/kernel/blocks/backup/restore/ndb_restore ndb/src/mgmclient/ndb_mgm ndb/src/mgmsrv/ndb_mgmd ndb/tools/ndb_delete_all ndb/tools/ndb_desc ndb/tools/ndb_drop_index ndb/tools/ndb_drop_table ndb/tools/ndb_select_all ndb/tools/ndb_select_count ndb/tools/ndb_show_tables ndb/tools/ndb_waiter

ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.


sql/share/charsets/cp852.xml:
  Missing cp852_bin was added.
strings/ctype-simple.c:
  Check that unicode map was loaded

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

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

mysys/mf_keycache.c:
  bug fixed: when inited=0, can_be_used should be 0 too. (BUG#4901)
  end spaces removed (no merge problems as this file doesn't change much)

  Slovak collation didn't work: typo fix in the tailoring rules


strings/ctype-uca.c:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/r/ctype_uca.result:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/t/ctype_uca.test:
  Slovak collation didn't work: typo fix in the tailoring rules

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

into mysql.com:/home/wax/mysql/mysql-4.1group_concat

BUG#4535
BUG#4686


sql/item_sum.cc:
  Changed code of fix_fields
  Fixed wrong order of parameters in create_tmp_table
  Changed value set_sum_field in create_tmp_table

  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.


sql/sql_show.cc:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/t/ctype_recoding.test:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
mysql-test/r/ctype_recoding.result:
  Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.

into mysql.com:/Users/mikron/mysql-4.1


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged

into mysql.com:/home/wax/mysql/mysql-4.1group_concat

BUG#4535
BUG#4686


mysql-test/r/func_gconcat.result:
  add testes of blobs and null values
mysql-test/t/func_gconcat.test:
  add testes of blobs and null values
sql/item_sum.cc:
  replace code with maybe_null and change store mode of fields

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

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

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4508

Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.


mysql-test/r/timezone2.result:
  Added test for bug #4508
mysql-test/t/timezone2.test:
  Added test for bug #4508
scripts/mysql_create_system_tables.sh:
  Added one more test time zone to time zone tables which is needed for test for bug #4508.
sql/item_create.cc:
  CONVERT_TZ() now is treated as special function.
sql/item_create.h:
  CONVERT_TZ() now is treated as special function.
sql/item_timefunc.cc:
  Item_func_convert_tz now uses list of pre-opened time zone tables instead of trying to
  open them ad-hoc. Also it avoid calling of current_thd.
sql/item_timefunc.h:
  Added comment describing special nature of CONVERT_TZ() function.
  Optimization: Added own fix_fields() method and tz_tables member for caching pointer
  to list of open time zone tables to Item_func_convert_tz class.
sql/lex.h:
  CONVERT_TZ() now is treated as special function.
sql/mysql_priv.h:
  Removed function which is no longer used.
sql/set_var.cc:
  Now my_tz_find() accepts list of pre-opened time zone tables as last argument 
  and no longer needs pointer to current THD.
sql/set_var.h:
  Exported sys_time_zone, which is now used in sql_yacc.yy for quick finding out if we are
  setting @@time_zone variable.
sql/sql_base.cc:
  Moved propagation of pointers to open tables from global list to local select lists to
  open_and_lock_tables(), also added implicit usage of time zone tables as condition for
  such propagation.
sql/sql_lex.cc:
  Added fake_time_zone_tables_list which is used to indicate that time zone tables are
  implicitly used in statement.
  st_select_lex_unit::create_total_list(): if time zone tables are implicitly used in
  statement add them to global tables list.
sql/sql_lex.h:
  Added LEX::time_zone_tables_used member which is used to indicate that time zone tables 
  are implicitly used in this statement (by pointing to fake_time_zone_table_list) and 
  for holding pointer to those tables after they've been opened.
sql/sql_parse.cc:
  We should also create global table list if statement uses time zone tables implicitly.
  Added initialization of LEX::time_zone_tables_used to mysql_query_init().
sql/sql_prepare.cc:
  We should also create global table list if statement uses time zone tables implicitly.
sql/sql_select.cc:
  Removed functions which are no longer used.
sql/sql_yacc.yy:
  CONVERT_TZ() and @@time_zone variable are handled in special way since they implicitly 
  use time zone tables.
sql/tztime.cc:
  Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server".
  If statement uses CONVERT_TZ() function or @@time_zone variable is set then it implicitly
  uses time zone tables. We need to open and lock such tables with all other tables of 
  such statement.
  
  All code responsible for opening table was removed from tz_load_from_db() and function was 
  renamed to tz_load_from_open_tables() (which uses list of pre-opened tables).
  We also have new functions for construction and initialization of table list of time
  zone tables.
  my_tz_find() now always require list of pre-opened time zone tables and no longer needs
  current THD. So we have to pre-open them in my_tz_init().
  Also now we try to open time zone tables only if they were found during startup.
sql/tztime.h:
  New function for construction of table list of time zone tables my_tz_get_table_list().
  Now my_tz_find() requires list of pre-pened time zone tables instead of current thread.

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

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

you need to check in to find out another couple of typos


libmysql/libmysql.c:
  Typos in comments fixed.

libmysql/libmysql.c:
  Comments to mysql_stmt_bind_param(). A couple of typos in existing 
  comments fixed.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756

into mysql.com:/home/mydev/mysql-4.1-4100

  minor option description change.


sql/mysqld.cc:
  minor option description change.

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Compensate for "extra" lqhkeyreqrec during index read (when IgnoreError)
ndb/src/mgmsrv/main.cpp:
  Read corrent local node id
ndb/tools/waiter.cpp:
  Yet another user of LocalConfig

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

ndb/include/mgmcommon/ConfigRetriever.hpp:
  Separate connect and all/fetch
ndb/include/mgmcommon/LocalConfig.hpp:
  Use BaseString
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Separate connect and all/fetch
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Removed useless onlyNodeId
ndb/src/kernel/main.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.hpp:
  Separeted Configuration fetch/setup
ndb/src/mgmapi/mgmapi.cpp:
  Fixed some return codes
ndb/src/mgmclient/main.cpp:
  LocalConfig update
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changes ConfigRetreiver interface
ndb/src/mgmsrv/Services.cpp:
  Allow reserve same id twice
ndb/src/mgmsrv/main.cpp:
  Ignore SIGPIPE
ndb/src/ndbapi/TransporterFacade.cpp:
  ConfigRetriever interface

into mysql.com:/home/mydev/mysql-4.1-4100

Solved performance problems by fixing a typo, which prevented enabling of write buffer.


sql/ha_myisam.cc:
  bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash.
  Solved performance problems by fixing a typo, which prevented enabling of write buffer.
  Supplied no test case, as it required too much data to see the performance regression.

  Collation name fixes.


configure.in:
  Collation name fixes.

testTransaction -n *Scan*
testTimeout -n *


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Added DUMP for tc appl timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Send tckey conf if m_exec_flags is set
  Added dump for appl timeout
ndb/test/include/HugoOperations.hpp:
  Add scanRead
ndb/test/ndbapi/testTimeout.cpp:
  Reenable
ndb/test/ndbapi/testTransactions.cpp:
  Fix scan test cases
ndb/test/run-test/daily-basic-tests.txt:
  reenable timeout-tests
  added testTransaction -n Scan* testcases
ndb/test/src/HugoOperations.cpp:
  Fix scan
ndb/test/src/NDBT_Test.cpp:
  Drop table before test...(if createTable==true)