data files.  Previously, writes were flushed until the doublewrite
buffer was created.  That would be too slow on systems where
os_file_flush() [or fsync(2)] is slow.  (Bug #12125)


innobase/include/os0file.h:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
innobase/os/os0file.c:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
innobase/trx/trx0sys.c:
  Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH

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

mysql-test/t/ndb_config.test:
  test requires ndb

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

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

  make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Auto merged
scripts/Makefile.am:
  - after merge fix: removed the "all" target - these files are now built via
    noinst_SCRIPTS instead.

  make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Delete: scripts/make_win_binary_distribution.sh
scripts/Makefile.am:
  - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
    make_win_src_distribution are created, but not installed. This is the proper fix
    for what I began in the previous ChangeSet
  - removed make_win_binary_distribution.sh from the distribution, as it's obsolete
    and outdated

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

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

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


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged

ndb/include/mgmapi/mgmapi_config_parameters.h:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fix LCP during SR parameters

added export symbols mysql_server_init and 
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)

mysql-test/r/ndb_config.result:
  New BitKeeper file ``mysql-test/r/ndb_config.result''
mysql-test/t/ndb_config.test:
  New BitKeeper file ``mysql-test/t/ndb_config.test''

ndb/include/mgmapi/mgmapi.h:
  Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
  Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
  Make param info public
ndb/tools/Makefile.am:
  Add ndb_config
ndb/tools/config.cpp:
  New BitKeeper file ``ndb/tools/config.cpp''

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

client via mysql_fetch_fields(). (Bug #11311)


mysql-test/r/func_str.result:
  Add new results
mysql-test/t/func_str.test:
  Add new regression test
sql/item_strfunc.cc:
  Fix length reported for LPAD() and RPAD() -- they always truncate to the
  length that is given.

  Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
  new file


strings/ctype-gbk.c:
  Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.

into  mysql.com:/usr/home/bar/mysql-4.1.b11754

into  mysql.com:/home/stewart/Documents/MySQL/4.0/main

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

into  mysql.com:/usr/home/bar/mysql-4.1.b11754

into deer.(none):/home/hf/work/mysql-4.0.clean

non-existent database. (Bug #10407)


mysql-test/r/create.result:
  Update results
mysql-test/t/create.test:
  Update error numbers
sql/mysql_priv.h:
  Adjust some other function signature so table and db information
  is passed down into create_frm().
sql/sql_table.cc:
  Check for database not existing after hitting an error when
  copying the .frm file for 'CREATE TABLE ... LIKE ...', and
  pass table and db name into rea_create_table().
sql/table.cc:
  Generate specific error message when .frm creation fails because
  the database does not exist.
sql/unireg.cc:
  Pass database and table name down into create_frm().

into  mysql.com:/home/stewart/Documents/MySQL/4.0/main

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

VC++Files/libmysqld/libmysqld.dsp:
  we should have SAFEMALLOC here

into  mysql.com:/usr/home/bar/mysql-4.1.b11216

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

  removing extra empty line
  ,


strings/ctype-latin1.c:
  removing extra empty line
  ,

Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.



strings/ctype-latin1.c:
  Bug#11216: 'show character set' describes latin1 incorrectly
  Fixed to- and from-Unicode conversion maps.
mysql-test/r/ctype_latin1.result:
  changeing test results accordingly.
sql/share/charsets/Index.xml:
  Fixing comment: iso-8859-1 -> cp1252

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

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

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

  fix bug introduced in alter table

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

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

  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.


strings/ctype-cp932.c:
  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.