client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_charset.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/rpl_charset.test:
  Manual merge
sql/log_event.cc:
  Manual merge

into mysql.com:/home/my/mysql-5.0

mysql-test/r/strict.result:
  Update tests after merge
mysql-test/t/strict.test:
  Update tests after merge (We can't handle 2.2E-307) anymore as this is out of range with the new method to calculate double
sql/item_sum.h:
  After merge fix
  use my_strtoll10 instead of my_strtonll

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

into mysql.com:/home/psergey/mysql-5.0-build

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

  Take into account that bitmap_is_set() may return any non-zero zero value when the bit is set.

sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

include/my_sys.h:
  sol9x86, sunfire100b, qnx compatibility
mysql-test/t/rpl_rotate_logs.test:
  fix the test
sql/ha_innodb.cc:
  don't bother
sql/handler.cc:
  few more ways to crash mysqld :)
sql/handler.h:
  gdb/safemalloc workaround
sql/log.cc:
  rotate a binlog on heuristic recover
sql/mysqld.cc:
  rotate a binlog on heuristic recover

into hundin.mysql.fi:/home/heikki/mysql-5.0

into mysql.com:/home/my/mysql-5.0

  Disable the XA code in InnoDB crash recovery; when Jan and Sergei want to test XA, they should revert this patch


innobase/trx/trx0trx.c:
  Disable the XA code in crash recovery; when Jan and Sergei want to test XA, they should revert this patch

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
include/m_string.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
libmysql/libmysql.c:
  ul
mysql-test/r/ps_1general.result:
  Merge
mysql-test/t/derived.test:
  Merge
mysql-test/t/ps_1general.test:
  Merge
mysql-test/t/type_float.test:
  Merge
sql/field.cc:
  ul
sql/item.cc:
  ul
sql/item.h:
  ul
sql/item_func.h:
  ul
sql/item_strfunc.cc:
  ul
sql/item_sum.cc:
  ul
sql/item_sum.h:
  ul
sql/procedure.h:
  ul
sql/sql_derived.cc:
  Trivial merge
sql/sql_parse.cc:
  ul
sql/sql_update.cc:
  Trivial merge
strings/strtod.c:
  Use updated code from 4.1
  This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)

into mysql.com:/home/bkroot/mysql-4.1

sql/log_event.cc:
  Auto merged

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

into hundin.mysql.fi:/home/jan/mysql-5.0

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1

sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

Fixed failing myisam.test and rpl_rotate_logs.test on some configurations


mysql-test/r/myisam.result:
  Portability fix
mysql-test/r/rpl_rotate_logs.result:
  Portability fix
mysql-test/t/myisam.test:
  Depending on if you compiled with -DHAVE_RAID or not, you could get different errors for this test
mysql-test/t/rpl_rotate_logs.test:
  Portability fix
sql/ha_innodb.cc:
  Fixed compiler warnings

independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.


mysql-test/r/user_var.result:
  Test changes accordintly
mysql-test/t/user_var.test:
  Test changes accordintly

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1


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

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


sql/field.cc:
  Auto merged

Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)




client/mysql.cc:
  Fix wront usage of charset (found during review of pushed code)
include/m_string.h:
  Backported my_strtod() from 5.0
mysql-test/mysql-test-run.sh:
  Run also mysql_client_test with --debug
mysql-test/r/ps_1general.result:
  Safety fix (if mysql_client_test.test fails)
mysql-test/r/type_float.result:
  More test
mysql-test/t/mysql_client_test.test:
  Comments for what to do if this test fails
mysql-test/t/ps_1general.test:
  Safety fix (if mysql_client_test.test fails)
mysql-test/t/type_float.test:
  More test to better test new strtod() function
  Test also bug #7740 (wrong comparsion between integer and float-in-integer-range)
sql/field.cc:
  Backport my_strntod() from 5.0
sql/item.cc:
  Backport my_strntod() from 5.0
sql/item.h:
  Backport my_strntod() from 5.0
sql/item_func.h:
  Backport my_strntod() from 5.0
sql/item_strfunc.cc:
  Backport my_strntod() from 5.0
sql/item_sum.cc:
  Backport my_strntod() from 5.0
sql/item_sum.h:
  Backport my_strntod() from 5.0
sql/procedure.h:
  Backport my_strntod() from 5.0
strings/ctype-simple.c:
  Backport my_strntod() from 5.0
strings/ctype-ucs2.c:
  Backport my_strntod() from 5.0
strings/strtod.c:
  Backport my_strntod() from 5.0
  Change conversion to delay division as long as possible.
  This gives us more exact integer-> float conversion for numbers of type '123.45E+02'

sql/mysqld.cc:
  Change _ to - for ndb-cache-check-time variable

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

  split into script/conf for easier deployment

  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.


mysys/charset.c:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/t/ctype_latin1.test:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/r/ctype_latin1.result:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.

  optimize test_if_minus() when not UCS2 support is compiled.


sql/field.cc:
  optimize test_if_minus() when not UCS2 support is compiled.