into mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

We should not overwrite res if it is returned from a const item.

mysql-test/r/order_by.result:
  After merge fix
mysql-test/t/symlink.test:
  Comments

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/order_by.test:
  Merge
sql/sql_lex.cc:
  Merge
sql/sql_yacc.yy:
  Use local copy

sql/filesort.cc:
  Auto merged

mysys/my_symlink.c:
  More debugging

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

into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged

sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query


sql/sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

sql/mysqld.cc:
  To allow builds without InnoDB ("classic"), the reference to 'innobase_use_checksums' must be guarded by an appropriate '#ifdef' (bug#7961).

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

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

mysql-test/r/order_by.result:
  Test result for BUG#7331.
mysql-test/t/order_by.test:
  Test for BUG#7331.
sql/sql_select.cc:
  Fix for BUG#7331.

into mysql.com:/home/timka/mysql/src/4.1-bug-7331

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into mysql.com:/home/timka/mysql/src/4.1-bug-7331


sql/sql_select.cc:
  Auto merged

  after merge fix


mysql-test/r/user_var.result:
  after merge fix

  after merge fix


mysql-test/r/func_str.result:
  after merge fix

sql/item_strfunc.cc:
  Auto merged
mysql-test/r/user_var.result:
  SCCS merged
mysql-test/r/func_str.result:
  merge

  bug#7839 ncorrect collation for char(ascii('a'))


sql/item_strfunc.cc:
  bug#7839 ncorrect collation for char(ascii('a'))
mysql-test/r/func_str.result:
  bug#7839 ncorrect collation for char(ascii('a'))
mysql-test/r/user_var.result:
  bug#7839 ncorrect collation for char(ascii('a'))

  Move out-of-order option.


client/mysqldump.c:
  Move out-of-order option.

into mysql.com:/usr/home/bar/mysql-5.0


libmysql/libmysql.c:
  Auto merged

  bug#7891: mysql_character_set_name() returns collation


libmysql/libmysql.c:
  bug#7891: mysql_character_set_name() returns collation

client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/r/user_var.result:
  SCCS merged
ndb/docs/Makefile.am:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.1-clean

  Bug#7721


ndb/docs/Makefile.am:
  Bug#7721

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

sql/mysqld.cc:
  more suggestive warning message
sql/sql_class.h:
  need a method to see MYSQL_LOG::name (the name of the binlog but without the numeric extension)

into mysql.com:/home/mysql_src/mysql-4.1-clean

Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory


client/mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged

mysql-test/r/show_check.result:
  Update results

to 5.0 tree (since it was lost during last merge).


mysql-test/r/func_sapdb.result:
  Updated test result after fixing bug #7586 "TIMEDIFF for sec+microsec not
  working properly" in 5.0 tree.
sql/item_timefunc.cc:
  calc_time_diff():
    Use simplier and less error-prone implementation. Now we are counting
    difference between time values in microseconds and then convert it to
    seconds + microseconds value (instead of using seconds and taking
    difference in "second_part"s into account).