myisam/Makefile.am:
  put zlib at the end (libtool adds the whole bunch of dependencies right after that)
sql/Makefile.am:
  put zlib at the end (libtool adds the whole bunch of dependencies right after that)

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


sql/mysql_priv.h:
  Auto merged

sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged

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

into build.mysql.com:/users/rburnett/mysql-4.1


sql/mysql_priv.h:
  Auto merged

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

sql/sql_select.cc:
  why cannot I compare (type) to (const type) ?????

Fix for MyISAM. Tests for MyISAM and HASH+BTREE.

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

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

into poseidon.(none):/home/tomas/mysql-4.1

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


sql/sql_select.cc:
  Auto merged

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

into poseidon.(none):/home/tomas/mysql-4.1

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

in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.


sql/handler.cc:
  making COMMIT wait if FLUSH TABLES WITH READ LOCK happened.
sql/lock.cc:
  an additional stage so that FLUSH TABLES WITH READ LOCK blocks COMMIT:
  make_global_read_lock_block_commit():
  taking the global read lock is TWO steps (2nd step is optional; without
  it, COMMIT of existing transactions will be allowed):
  lock_global_read_lock() THEN make_global_read_lock_block_commit().
sql/mysql_priv.h:
  new argument to wait_if_global_read_lock()
sql/sql_class.h:
  THD::global_read_lock now an uint to reflect the 2 steps of global read lock (does not block COMMIT / does)
sql/sql_db.cc:
  update for new prototype
sql/sql_parse.cc:
  implementing the two steps of global read lock so that FLUSH TABLES WITH READ LOCK can block COMMIT without deadlocking with COMMITs.

bug#4761 - more validation of hosts
bug#4511 - only non depricated should be saved in config
         - fix ConfigInfo::BOOL w.r.t deprication


mysql-test/ndb/ndb_config_2_node.ini:
  Removed need of unique filesystem
mysql-test/ndb/ndbcluster.sh:
  Removed need of unique filesystem
  Add "" around variables for increased portability
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Added checking of hostnames already in InitConfigFileParser
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Add checking of hostnames when retreiving configuration
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Filename.hpp:
  Added ndb_%u to filesystempath
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Added ndb_%u to filesystempath

When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.


mysql-test/r/order_by.result:
  Fixed wrong (non-standard) test results
  Added test case for bug #4302
  Added tests for other ambiguos and potentially ambigous cases in order by clause
mysql-test/t/order_by.test:
  Fixed wrong (non-standard) test results
  Added test case for bug #4302
  Added tests for other ambiguos and potentially ambigous cases in order by clause
sql/sql_select.cc:
  We should ignore only not_found_item errors when searching for item in find_order_in_list() 
  to be able to catch ambiguities.

   static linking against an unpatched glibc 2.3 is causing trouble
 - add "glibc23" to the release suffix in this case
 - re-ordered the Changelog that was messed up by a BK merge
   (RPM is picky about this)

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

into mysql.com:/home/pem/work/mysql-4.1

Bugfix for bug#5072, removed table version in BLOB table name since this is incremented at alter table

into mysql.com:/home/pem/work/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.emb

into poseidon.(none):/home/tomas/mysql-4.1-clean

sql/field.h:
  Fixed compiler warnings.

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

into poseidon.(none):/home/tomas/mysql-4.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

mysql-test/t/range.test:
  warnings disabled

client/mysql.cc:
  in_comment is now outside the add_line().

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1