mysql-test/r/bigint.result:
  updated
mysql-test/r/func_misc.result:
  updated
mysql-test/t/bigint.test:
  updated

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1

  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois


innobase/include/data0type.h:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
innobase/include/data0type.ic:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
innobase/data/data0type.c:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
sql/ha_innodb.cc:
  Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois

  Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions


innobase/include/data0type.h:
  Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions
innobase/include/data0type.ic:
  Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions

mysys/my_init.c:
  #include moved to mysys_priv.h
mysys/mysys_priv.h:
  #include moved to mysys_priv.h
sql/hostname.cc:
  removed unnecessary #include

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

mysql-test/r/ctype_utf8.result:
  updated
mysql-test/r/key.result:
  updated
mysql-test/r/myisam.result:
  updated
mysql-test/r/type_blob.result:
  updated
mysql-test/t/ctype_utf8.test:
  updated
mysql-test/t/key.test:
  updated
mysql-test/t/myisam.test:
  updated
mysql-test/t/type_blob.test:
  updated

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

   configure.in needs to be updated and configure needs to be recreated
   for the build to succed

sql/sql_class.h:
  changed methods names
sql/sql_prepare.cc:
  changed methods names
  removed incorrect comments
  added error handler

sql/item.h:
  typo fixed
sql/item_func.h:
  clear refernce on deleted variable
sql/item_subselect.cc:
  layout fixed
sql/sql_base.cc:
  temporary memory pool allocation moved from open_and_lock_tables
sql/sql_prepare.cc:
  temporary memory pool allocation moved
  changing in routine suggeted by Monty
tests/client_test.c:
  uncomment accidently commented test

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

  Remove the now redundant flag DATA_NONLATIN1; better comments


sql/ha_innodb.cc:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.h:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.ic:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/data/data0type.c:
  Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/rem/rem0cmp.c:
  Remove the now redundant flag DATA_NONLATIN1; better comments

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

Problem was that we checked for existing connection in stmt_close
and did not free(stmt) if it's closed (that didn't work well with
embedded)
I just added new flag to the stmt_close and now we check it instead
of connection


libmysql/client_settings.h:
  declaration changed
libmysql/libmysql.c:
  stmt_close and it's calls modified
sql-common/client.c:
  stmt_close call modified

  Fix a typo in a comment


innobase/include/data0type.h:
  Fix a typo in a comment
innobase/include/data0type.ic:
  Fix a typo in a comment

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

sql/mysqld.cc:
  Safety fix
sql/set_var.cc:
  Safety fix
sql/sql_db.cc:
  indentation cleanup

heap/hp_delete.c:
  added code for right calculation 
  of Index_length in HEAP tables with BTREE indexes
heap/hp_write.c:
  added code for right calculation 
  of Index_length in HEAP tables with BTREE indexes
mysql-test/r/show_check.result:
  added test for BUG #2719 "Heap tables status shows wrong or missing data"
mysql-test/t/show_check.test:
  added test for BUG #2719 "Heap tables status shows wrong or missing data"

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


sql/mysql_priv.h:
  Auto merged

into mashka.mysql.fi:/home/my/mysql-4.1

  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again


sql/ha_innodb.cc:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/data/data0type.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/dict/dict0crea.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/dict/dict0load.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/include/data0type.h:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/include/data0type.ic:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again
innobase/rem/rem0cmp.c:
  Multiple charset support for InnoDB; note that if you create tables and the default charset-collation is not latin1_swedish_ci, then you cannot use those tables if you downgrade to 4.0 again

into mashka.mysql.fi:/home/my/mysql-4.1


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048


client/client_priv.h:
  Added --open-files-limit to mysqlbinlog
client/mysqlbinlog.cc:
  Added --open-files-limit to mysqlbinlog
include/config-win.h:
  Define that you can have up to 2048 files open on windows
include/my_global.h:
  Allow override of OS_FILE_LIMIT
include/my_sys.h:
  Cleanup
  Added prototypes for my_set_max_open_files() and my_free_open_files()
libmysql/Makefile.shared:
  Added my_file.c
myisam/myisamlog.c:
  Use my_set_max_open_files()
mysys/Makefile.am:
  Use my_file.c (for mysqlbinlog)
mysys/my_alloc.c:
  Remove compiler warning
mysys/my_div.c:
  MY_NFILE -> my_file_limit
mysys/my_dup.c:
  MY_NFILE -> my_file_limit
mysys/my_fopen.c:
  MY_NFILE -> my_file_limit
mysys/my_open.c:
  MY_NFILE -> my_file_limit
mysys/my_static.c:
  Allow changing of open files limit
mysys/my_static.h:
  Allow changing of open files limit
sql/mysqld.cc:
  Max open files handling moved to my_set_max_open_files()

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

  Remove the downgrade 4.1.2 -> 4.0.18 patch accidentally merged from 4.0 to 4.1; the patch must NOT be merged to 4.1; this fixes Bug #2883


innobase/trx/trx0sys.c:
  Remove the downgrade 4.1.2 -> 4.0.18 patch accidentally merged from 4.0 to 4.1; the patch must NOT be merged to 4.1; this fixes Bug #2883

Now checking of the RTree keys works without errors.
Worklog entry about appropriate checkup's routine for the RTree added


myisam/mi_check.c:
  HA_SPATIAL checks added
mysql-test/r/gis-rtree.result:
  Appropriate test resutl
mysql-test/t/gis-rtree.test:
  test case

after merge fix


sql/item_subselect.cc:
  revision of fix_fields calls in subqueries transformation
sql/sql_prepare.cc:
  after merge fix

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

small cleanup

   error with the IBM xlc_r compiler


strings/strtod.c:
   - No C++ comments in .c files, please...

ltconfig:
  libtool upgrade isn't necessary
ltmain.sh:
  be consistent

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


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

include/my_global.h:
  do macro correctly
mysql-test/r/ctype_utf8.result:
  updated
mysql-test/r/myisam.result:
  updated
mysql-test/r/type_blob.result:
  updated
mysql-test/t/ctype_utf8.test:
  updated
mysql-test/t/type_blob.test:
  new tests
sql/share/english/errmsg.txt:
  specify that max key length is in BYTES
sql/share/russian/errmsg.txt:
  specify that max key length is in BYTES
sql/share/ukrainian/errmsg.txt:
  specify that max key length is in BYTES
sql/sql_table.cc:
  if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it.
  cleanup