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

running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.


include/mysqld_error.h:
  New error codes (warning codes in fact) to warn that the slave was already started or stopped
mysql-test/include/master-slave.inc:
  STOP SLAVE now prints a warning, not an error, so we should expect a warning here
sql/share/czech/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/danish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/dutch/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/english/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/estonian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/french/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/german/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/greek/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/hungarian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/italian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/japanese/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/korean/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/norwegian-ny/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/norwegian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/polish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/portuguese/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/romanian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/russian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/serbian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/slovak/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/spanish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/swedish/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/share/ukrainian/errmsg.txt:
  New messages to warn that the slave was already started or stopped
sql/sql_repl.cc:
  Do not give an error when the user does START SLAVE on an already
  running slave, just give a warning. Same thing for STOP SLAVE.

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

sql/item.h:
  Change constant values order according to the word "coercibility" nature
sql/item_func.cc:
  Change constant values order according to the word "coercibility" nature

like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.

  Produce an error when a field collation and charset are not compatible


sql/sql_yacc.yy:
  Produce an error when a field collation and charset are not compatible

SELECT latin1_expr COLLATE anpther_charset_collation

so that it has fetched the most from the master's binlog before the master
accidently dies. SCRUM task #756.


sql/slave.cc:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.
sql/slave.h:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.

Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727.


client/client_priv.h:
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client
client/mysql.cc:
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
  Disabling can be safer when the server silently dies & restarts.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


BitKeeper/etc/ignore:
  auto-union
sql/sql_select.cc:
  Auto merged

  Typo fix.


bdb/os_win32/os_rename.c:
  Typo fix.

  Portability fix. GetLongPathName is not supported by Windows95.


bdb/os_win32/os_rename.c:
  Portability fix. GetLongPathName is not supported by Windows95.

Added GeometryCollection type.

  Fix for coercibility of function


sql/item_func.cc:
  Fix for coercibility of function

  Charset conversion function changes coercibility to IMPLICIT


sql/item_strfunc.cc:
  Charset conversion function changes coercibility to IMPLICIT

  _charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT


sql/item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
sql/sql_yacc.yy:
  _charset cast changes coercibility to implicit

   Coercibility, initial stage
item_func.h:
  Coercibility, initial stage


sql/item_func.h:
  Coercibility, initial stage
sql/item.cc:
   Coercibility, initial stage
sql/item_create.cc:
   Coercibility, initial stage
sql/item_create.h:
   Coercibility, initial stage
sql/item.h:
   Coercibility, initial stage
sql/item_func.cc:
   Coercibility, initial stage
sql/lex.h:
   Coercibility, initial stage
sql/sql_yacc.yy:
   Coercibility, initial stage

cmd-line-utils/libedit/readline.c:
  Portability fix (For IRIX)
include/my_global.h:
  Portability fix (For Tru64)
include/my_xml.h:
  Portability fix (True64)
  ('leave' is already defined)
strings/xml.c:
  Portability fix (True64)

configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/log_event.cc:
  merge
sql/mysqld.cc:
  merge

include/config-win.h:
  Removed wrong ;
include/my_global.h:
  Portability fix for AIX

mysql-test/Makefile.am:
  Auto merged

  Added new tests for better coverage of
  min/max optimization code.
func_group.test:
  Added new tests for better coverage of 
  min/max optimization code.
opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.


sql/opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.
mysql-test/t/func_group.test:
  Added new test for better coverage of 
  min/max optimization code.
mysql-test/r/func_group.result:
  Added new tests for better coverage of
  min/max optimization code.

Fixed bug in RAND() usage in mysqlbinlog


configure.in:
  Added detection if pthread_attr_getstacksize() exists
include/thr_lock.h:
  Fixed wrong comment
sql/log_event.cc:
  Fixed bug in RAND() usage in mysqlbinlog
sql/mysqld.cc:
  Portablity fix
sql/repl_failsafe.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/slave.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_class.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_insert.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_show.cc:
  Set host_or_ip for system threads (to make other code simpler)

  set names binary  didn't work
  ,


sql/sql_yacc.yy:
  set names binary  didn't work
  ,

  Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()


sql/item_strfunc.cc:
  Two separate functions charset() and collatio()
sql/item_strfunc.h:
  Two separate functions charset() and collation()
sql/sql_yacc.yy:
  Two separate functions charset() and collatio()

into hundin.mysql.fi:/home/igor/dev/mysql-4.1

  Now all text fields convert data into proper charset before storing


sql/field.cc:
  Now all text fields convert data into proper charset before storing

into hundin.mysql.fi:/home/igor/dev/mysql-4.1

  Added tests for extended max/min optimization
opt_sum.cc:
  Extended min/max optimization


sql/opt_sum.cc:
  Extended min/max optimization
mysql-test/t/func_group.test:
  Added tests for extended max/min optimization
mysql-test/r/func_group.result:
  Added tests for extended max/min optimization