mysql-test/r/subselect.result:
  test of cleanup bug
mysql-test/t/subselect.test:
  test of cleanup bug
sql/sql_select.cc:
  fixed cleanup

into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of IN with error
mysql-test/t/subselect.test:
  test of IN with error

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.


mysql-test/r/union.result:
  A fix of merge fix

into myvenu.com:/home/venu/work/sql/dev-4.1

support-files/mysql.spec.sh:
  Change -IN_RPM -> --rpm
scripts/make_win_src_distribution.sh:
  Change -WINDOWS -> --windows (call to mysql_install_db)
scripts/mysql_install_db.sh:
  Change -IN_RPM -> --rpm and -WINDOWS -> --windows

  some default_charset_info were removed


sql/sql_base.cc:
  some default_charset_info were removed
sql/table.cc:
  some default_charset_info were removed
sql/unireg.cc:
  some default_charset_info were removed
sql/item_cmpfunc.cc:
  some default_charset_info were removed
sql/item_func.cc:
  some default_charset_info were removed

  LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.


sql/sql_load.cc:
  LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.

  use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument


sql/hash_filo.h:
  Move charset to constructor argument
sql/hostname.cc:
  Move charset to constructor argument
sql/item_cmpfunc.h:
  Use cmp_charset
sql/mysql_priv.h:
  _default_charset_info has been removed
sql/sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
sql/item.h:
  use of new argument
sql/sql_acl.cc:
  use of new argument

SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT

sql/mysqld.cc:
  Auto merged

sql/item_subselect.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

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

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

Added Centroid(), Area() tests for MultiPolygon objects.

Code clean-up according 'Coding Standards and Styles'

BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
  Delete: netware/netware.patch
netware/BUILD/mwenv:
  Import patch novell41b.patch
netware/init_db.sql:
  Import patch novell41b.patch
netware/test_db.sql:
  Import patch novell41b.patch

sql/log_event.cc:
  Fixed character set bug when replicating user variables.
  Simple optimisation of User_var_log_event::write_data

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

binary and primary collations in the future

SET NAMES <charset name> [COLLATE <collation name>]

into myvenu.com:/home/venu/work/sql/dev-4.1

  Remove the unused code (from previous commit)


sql/sql_prepare.cc:
  Remove the unused code (from previous commit)

Added new client tests (EXPLAIN + DECIMAL conv)



sql/sql_prepare.cc:
  Fix EXPLAIN bug with binary protocol
tests/client_test.c:
  New tests for EXPLAIN + DECIMAL conv

   distribution to fix a test failure in test "func_encrypt"

into mysql.com:/home/greg/bk/mysql-4.1

  Change mode to -rwxrwxr-x


netware/BUILD/compile-AUTOTOOLS:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-linux-tools:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-END:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-START:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-all:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-standard:
  Change mode to -rwxrwxr-x
netware/BUILD/mwasmnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwccnlm:
  Change mode to -rwxrwxr-x
netware/BUILD/mwenv:
  Change mode to -rwxrwxr-x
netware/BUILD/mwldnlm:
  Change mode to -rwxrwxr-x

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  is now synonim for
SELECT expr COLLATE <expr_charset>_bin

BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def
BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
  Delete: netware/mw/mwenv
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
netware/BUILD/mwasmnlm:
  Import patch novell41.patch
netware/BUILD/mwccnlm:
  Import patch novell41.patch
netware/BUILD/mwldnlm:
  Import patch novell41.patch
netware/BUILD/nwbootstrap:
  Import patch novell41.patch
scripts/make_binary_distribution.sh:
  Import patch novell41.patch

into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.

include/mysql_embed.h:
  Disable shared memory for embedded version
libmysqld/lib_sql.cc:
  Fix for --debug version (init_thread_environment was called in wrong place)
sql/log_event.h:
  Portability fix
sql/mysqld.cc:
  Fix for --debug version (init_thread_environment was called in wrong place)
sql/sql_parse.cc:
  Simply code cleanup

for binary collations