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


sql/item.cc:
  Auto merged

  Bug fix
  0 stayed for length here, now it is charset.


sql/sql_show.cc:
  Bug fix

usage of expressions whose result are to be saved into user vars.

  Copy as is if src or dst are binary


sql/sql_string.cc:
  Copy as is if src or dst are binary

  binary comparing alway must be used, because sort_string() is executed for textual data.


sql/sql_select.cc:
  binary comparing alway must be used, because sort_string() is executed for textual data.

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


sql/mysqld.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

and isn't used in libraries any longer

  system_charset_info was removed


client/mysql.cc:
  system_charset_info was removed
client/mysqlcheck.c:
  system_charset_info was removed
client/mysqldump.c:
  system_charset_info was removed
client/mysqlimport.c:
  system_charset_info was removed
client/mysqltest.c:
  system_charset_info was removed

Some system_charset_info were removed


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

  less system_charset_info


sql/sql_db.cc:
  less system_charset_info
sql/sql_parse.cc:
  less system_charset_info

sql/item_subselect.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

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

  Use LEX charset instead of system one


sql/sql_lex.cc:
  Use LEX charset instead of system one

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

removed all side effects from asserts for not to confuse casual reader

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


mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged

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

(normal protocol only, prepared protocol already handles it)


sql/protocol.cc:
  Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format

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


sql/mysqld.cc:
  Auto merged

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


sql/sql_lex.h:
  Auto merged

mysql-test/r/union.result:
  sect of uncachable union
mysql-test/t/union.test:
  sect of uncachable union
sql/sql_lex.h:
  fixed uncachable union

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

  Move all charset recoding to the same place


sql/sql_lex.cc:
  Move all charset recoding to the same place

  Unnesessary binary() calls have been removed


sql/field.cc:
  Unnesessary binary() calls have been removed
sql/item_strfunc.cc:
  Unnesessary binary() calls have been removed
sql/item_func.cc:
  Unnesessary binary() calls have been removed
sql/sql_analyse.cc:
  Unnesessary binary() calls have been removed
sql/filesort.cc:
  Unnesessary binary() calls have been removed

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

without arguments ...


client/mysql.cc:
  A fix for bug #90

myisam/mi_check.c:
  Additional condition added - we only can create 
  spatial key row-by-row now

mysql-test/t/rpl_rotate_logs.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged

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


sql/item_cmpfunc.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of constant redecing
mysql-test/t/subselect.test:
  test of constant redecing
sql/item_cmpfunc.cc:
  fixed cached constsnt determination

Added expire-logs-days option 


mysql-test/r/rpl_rotate_logs.result:
  Added test for 'PURGE LOGS BEFORE'
mysql-test/t/rpl_rotate_logs.test:
  Added test for 'PURGE LOGS BEFORE'
sql/log.cc:
  For 'Purge logs before' command
sql/mysqld.cc:
  Added 'expire-logs-days' option
sql/set_var.cc:
  Added 'expire-logs-days' option
sql/sql_class.h:
  For 'Purge logs before' command
sql/sql_parse.cc:
  Added 'expire-logs-days' option
sql/sql_yacc.yy:
  For 'Purge logs before' command

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


sql/mysqld.cc:
  Auto merged