zlib/ChangeLog:
  Import zlib-1.2.3
zlib/FAQ:
  Import zlib-1.2.3
zlib/README:
  Import zlib-1.2.3
zlib/adler32.c:
  Import zlib-1.2.3
zlib/compress.c:
  Import zlib-1.2.3
zlib/crc32.c:
  Import zlib-1.2.3
zlib/deflate.c:
  Import zlib-1.2.3
zlib/deflate.h:
  Import zlib-1.2.3
zlib/gzio.c:
  Import zlib-1.2.3
zlib/infback.c:
  Import zlib-1.2.3
zlib/inffast.c:
  Import zlib-1.2.3
zlib/inflate.c:
  Import zlib-1.2.3
zlib/inflate.h:
  Import zlib-1.2.3
zlib/inftrees.c:
  Import zlib-1.2.3
zlib/inftrees.h:
  Import zlib-1.2.3
zlib/trees.c:
  Import zlib-1.2.3
zlib/zconf.h:
  Import zlib-1.2.3
zlib/zlib.3:
  Import zlib-1.2.3
zlib/zlib.h:
  Import zlib-1.2.3
zlib/zutil.c:
  Import zlib-1.2.3
zlib/zutil.h:
  Import zlib-1.2.3
zlib/README.MySQL:
  Import zlib-1.2.3

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.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.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.

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

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

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1


include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Manual merge after 4.0 fix

support-files/MacOSX/Makefile.am:
  Auto merged
scripts/Makefile.am:
  - manual merge
support-files/Makefile.am:
  - manual merge

sql/lock.cc:
  Used flags immediately in call
sql/mysql_priv.h:
  Added RTFC (short for remove_table_from_cache)
  for constants and used hex syntax to clarify it is bits
  in the flags
sql/sql_base.cc:
  Use flags parameter immediately and use flags immediately in call
  Change to other variant of eternal loop variant
sql/sql_table.cc:
  Use flags immediately in call

  they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way


scripts/Makefile.am:
  - don't install the following files with "make install", as they are
    not needed to be installed: 
    make_win_src_distribution, make_win_binary_distribution,
    make_binary_distribution, make_sharedlib_distribution
support-files/MacOSX/Makefile.am:
  - don't install the Mac OS X support files when running "make install" -
    they're not needed outside of the source tree (BUG#12057)
support-files/Makefile.am:
  - don't install the RPM spec files with "make install" - they are not
    needed outside of the source tree

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

- do not discover temporary files and make them visible

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

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1


tests/mysql_client_test.c:
  Auto merged

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

  fix error code to avoid clash with 5.0/5.1


ndb/include/kernel/signaldata/AlterTable.hpp:
  Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
  Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
  Change error codes to remove clash from 5.0

  add testcase to autotest


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove ;
ndb/test/run-test/daily-basic-tests.txt:
  add test case

client/mysqldump.c:
  Added casts.
include/my_sys.h:
  Define for alloca() changed for Metrowerks compiler.
myisam/rt_split.c:
  Added cast.

ndb/include/kernel/signaldata/AlterTable.hpp:
  Add error code for backup in progress
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Add backup state
ndb/include/kernel/signaldata/DropTable.hpp:
  Add error code for backup in progress
ndb/include/ndbapi/NdbDictionary.hpp:
  Add backup state
ndb/src/kernel/blocks/backup/Backup.cpp:
  1) remove invalid require (util_sequence_ref) crash
  2) Don't backup objects dropping/creating
  3) set correct error code on backup fragment ref (crash)
  4) save TrigAttrInfo header when getting log full (crash)
  5) lock/unlock tables during backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  1) add mutex lock/unlock as part of drop/alter table
  2) add lock/unlock for backup
  3) remove TC from backup trigger loop
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Add BACKUP_ONGOING state
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add backup state
ndb/src/ndbapi/ndberror.c:
  Add error code for backup in progress
ndb/test/ndbapi/testBackup.cpp:
  Add testcase for testBackup -n BackupDDL
ndb/tools/drop_index.cpp:
  Fix ndb_drop_index
ndb/tools/listTables.cpp:
  Print of backup state