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

sql/item.cc:
  initialize variables

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

mysql-test/r/subselect.result:
  correct results of SOME subquery
sql/item_cmpfunc.cc:
  some comments added
  fixed optimized SOME subquery

refernces if subqueri is not in HAVING clause (BUG#7079)
  and the same used for subquery transformetion


mysql-test/r/subselect.result:
  reference on changable fields from subquery
mysql-test/t/subselect.test:
  reference on changable fields from subquery
sql/item.cc:
  new reference which refer to current value not to result used
sql/item.h:
  new reference which refer to current value not to result used
sql/item_subselect.cc:
  new reference which refer to current value not to result used

sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

  Call mark_as_null_row in join_read_const and join_read_system.


mysql-test/r/multi_update.result:
  Testcase for BUG#5837
mysql-test/t/multi_update.test:
  Testcase for BUG#5837
sql/table.h:
  Added comments

sql/password.c:
  check for buffer overflow in check_scramble_323

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

into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/srv/srv0srv.c:
  Auto merged

into hundin.mysql.fi:/home/marko/k/mysql-4.0

innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_class.cc:
  SCCS merged

innobase/dict/dict0dict.c:
  merged (ul)
innobase/include/dict0dict.h:
  merged (ul)
sql/ha_innodb.cc:
  merged (ul)
sql/log.cc:
  automerged

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

  Remove accidentally pushed unnecessary change


innobase/include/row0mysql.h:
  Remove accidentally pushed unnecessary change

       bug #7126: Test failure: 'func_str' when using '--ps-protocol'
       bug #7130: Test failure: 'type_uint' when using '--ps-protocol').

  Remove accidentally merged 4.0 changes
dict0dict.c:
  Remove the 4.0 fix accidentally auto-merged to 4.1
row0mysql.h, dict0dict.h:
  Remove a change auto-merged from 4.0


innobase/include/dict0dict.h:
  Remove a change auto-merged from 4.0
innobase/include/row0mysql.h:
  Remove a change auto-merged from 4.0
sql/log.cc:
  Remove accidentally merged 4.0 changes
innobase/dict/dict0dict.c:
  Remove accidentally merged 4.0 changes

innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/ha_innodb.cc:
  SCCS merged
sql/sql_class.cc:
  SCCS merged

  Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8


sql/ha_innodb.cc:
  Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
innobase/dict/dict0dict.c:
  Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
innobase/include/dict0dict.h:
  Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8

  In the FOREIGN KEY parser, do not cut 0xC2A0 from the end of an identifier if it was quoted


innobase/dict/dict0dict.c:
  In the FOREIGN KEY parser, do not cut 0xC2A0 from the end of an identifier if it was quoted

to reuse test results for both server and --embedded-server
versions.


BitKeeper/deleted/.del-ctype_big5.result.es~f75ebc9f8836316f:
  Delete: mysql-test/r/ctype_big5.result.es
BitKeeper/deleted/.del-ctype_uca.result.es~9fab42f7561fa166:
  Delete: mysql-test/r/ctype_uca.result.es

  Use different TESTS_BINDIR for --embedded-server


mysql-test/mysql-test-run.sh:
  Use different TESTS_BINDIR for --embedded-server

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-patches

Allow to insert not-assigned UJIS codes. 

  Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking. For -all-static linking libtool put -lc after the .la
  file and this put the libc regex functions before our regex functions
  when linking on Linux.


client/Makefile.am:
  Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking, for static linking libtool put -lc after the .la
  and this put the libc regex functions before out regex functions
  in the link on Linux.

(after discussion with SerG)


include/my_base.h:
  Handler error code added
myisam/mi_write.c:
  New error code handled
myisam/rt_index.c:
  check for zero length added
myisam/sp_key.c:
  zero length check added
mysql-test/r/gis-rtree.result:
  appropriate test result
mysql-test/t/gis-rtree.test:
  test case
sql/handler.cc:
  new error code handling added

  Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8


innobase/dict/dict0dict.c:
  Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8

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


sql/item_strfunc.cc:
  Auto merged

expression involving LEFT() function is used in GROUP BY
field.


mysql-test/r/func_str.result:
  A result for bug #7101 test case
mysql-test/t/func_str.test:
  Test case for bug #7101

  srv_printf_innodb_monitor(): Removed extraneous rewind() call.
  The caller of this function calls rewind() if necessary.
  In this way, we avoid rewind()ing stderr in
  srv_lock_timeout_and_monitor_thread().


innobase/srv/srv0srv.c:
  srv_printf_innodb_monitor(): Removed extraneous rewind() call.
  The caller of this function calls rewind() if necessary.
  In this way, we avoid rewind()ing stderr in
  srv_lock_timeout_and_monitor_thread().

  Added --with-csv and --with-example for CSV and Example storage engines


Build-tools/Do-compile:
  Added --with-csv and --with-example for CSV and Example storage engines

ndb/src/ndbapi/DictCache.cpp:
  fix aligment when 32-bit pointers and 64-bit ha_rows
ndb/src/ndbapi/DictCache.hpp:
  fix aligment when 32-bit pointers and 64-bit ha_rows

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged

  created by 4.1.7 as bugfix changed binary format


ndb/tools/restore/Restore.cpp:
  Fixed so that version 4.1.8 of restore can read
    files created by 4.1.7
ndb/tools/restore/Restore.hpp:
  Fixed so that version 4.1.8 of restore can read
    files created by 4.1.7
ndb/tools/restore/main.cpp:
  Fixed so that version 4.1.8 of restore can read
    files created by 4.1.7

into mysql.com:/home/dlenev/src/mysql-4.1-bg6765


sql/set_var.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged