Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)


sql/slave.cc:
  Working around hang of master < 3.23.50 on SELECT @@unknown_var
  (to enable 3.23.49->4.1.10 replication)

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

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

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

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

  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.

  bug#7891: mysql_character_set_name() returns collation


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

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

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/my/mysql-4.1

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

  Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.


sql/item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
mysql-test/t/func_gconcat.test:
  Added a test case for bug #7769.
mysql-test/r/func_gconcat.result:
  Added a test case for bug #7769.

include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
mysys/mf_iocache.c:
  SCCS merged

include/my_sys.h:
  Added function to call if IO_CACHE is moved
mysys/mf_iocache.c:
  Added function to call if IO_CACHE is moved
sql/filesort.cc:
  Tell that io_cache is moved

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

heap/hp_create.c:
  limit HEAP table size with max_heap_table_size
heap/hp_write.c:
  limit HEAP table size with max_heap_table_size
include/heap.h:
  limit HEAP table size with max_heap_table_size
sql/ha_heap.cc:
  limit HEAP table size with max_heap_table_size
  better estimation for mem_per_row

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

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

scripts/mysql_install_db.sh:
  Merge changes

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

support-files/mysql.spec.sh:
  - replaced obsoleted "BuildPrereq" with "BuildRequires" instead

compatible with 4.1.9


configure.in:
  bumped up ndb version

  --with-cluster are provided. Yes, this sounds like a contradiction -
  enabling debugging in NBD enables code parts that may still reveal 
  portability issues when compiled with non-gcc compilers. (request by TomasU)

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

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


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

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

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