configure.in:
  Adding logic to run blackhole configure option.
mysql-test/r/blackhole.result:
  Correction this, but I think I need to see why the warning is being generated in the first place.

sql/handler.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Resolving conflict in layout.

into zim.(none):/home/brian/mysql/mysql-5.0

mysql-test/r/ps_1general.result:
  Fix test case.
sql/handler.h:
  Added federated to the list so that any beta users won't end up with a mismatch for table enum

into zim.(none):/home/brian/mysql/mysql-4.1

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


client/mysql.cc:
  Auto merged

configure.in:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/Makefile.am:
  Edited for adding blackhole.
sql/handler.cc:
  Edited for adding blackhole.
sql/handler.h:
  Edited for blackhole.

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

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

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

into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


tests/mysql_client_test.c:
  Auto merged

  Don't run GBK test if not GBK support was compiled.


tests/mysql_client_test.c:
  Don't run GBK test if not GBK support was compiled.

  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal


mysql-test/t/ctype_ucs.test:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/t/type_newdecimal.test:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/r/ctype_ucs.result:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/r/type_newdecimal.result:
  Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal

into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


strings/ctype-big5.c:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

  -skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables 


mysql-test/r/information_schema.result:
  Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
sql/sql_show.cc:
  Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*

  post-merge fix.
  ,


mysql-test/r/func_str.result:
  post-merge fix.
  ,

myisam/myisamchk.c:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
mysql-test/r/func_str.result:
  merging
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into zim.(none):/home/brian/mysql/mysql-4.1


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

acinclude.m4:
  Change in message
mysql-test/r/blackhole.result:
  Lowered the number of inserts.
mysql-test/t/blackhole.test:
  Lowered the number of inserts.
sql/ha_blackhole.cc:
  Added indexes per Serg, correction of indention, added asserts per Serg.
sql/ha_blackhole.h:
  Indention fix, added methods for index...

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

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

sql/sql_parse.cc:
  The strange merge occured because this code shouldn't be there

mysql-test/r/type_blob.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Strange merge conflict

mysql-test/r/rpl_timezone.result:
  result update

  result update (default value changed from 4.1 to 5.0)


mysql-test/r/rpl_deadlock.result:
  result update (default value changed from 4.1 to 5.0)

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita


sql/mysqld.cc:
  Auto merged

  Wrong help string fix.


myisam/myisamchk.c:
  Wrong help string fix.

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

in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().

BitKeeper/etc/logging_ok:
  auto-union
libmysql/Makefile.shared:
  Auto merged
mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/slave.cc:
  merge
sql/slave.h:
  merge
sql/sql_show.cc:
  merge

  there was no check of result of 
  table->file->write_row() function. When count of rows was
  more than table max_rows(HEAP table) the following recodrs
  were not inserted to the table
  -'schema_table_store_record' function is added. 
    The function checks result of write_row function
    and convert HEAP table to MyISAM if necessary
  - Result check after write_row is added into all 
    I_S function which store the records to I_S tables  


mysql-test/r/information_schema.result:
  Bug #9317: Wrong count for tables in INFORMATION_SCHEMA
mysql-test/t/information_schema.test:
  Bug #9317: Wrong count for tables in INFORMATION_SCHEMA
sql/sql_select.cc:
  Bug #9317: Wrong count for tables in INFORMATION_SCHEMA
sql/sql_show.cc:
  Bug #9317: Wrong count for tables in INFORMATION_SCHEMA
sql/table.h:
  Bug #9317: Wrong count for tables in INFORMATION_SCHEMA

into neptunus.(none):/home/msvensson/mysql/bug9303

mysql-test/r/type_blob.result:
  Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is called.
sql/sql_parse.cc:
  Added missing else so that FIELD_TINY_BLOB can be selected

 and Bug#9159 "Server crash during mysql_stmt_close".
The patch adds support for single-row result sets in cursors.


libmysql/libmysql.c:
  If we wanted a cursor, and the server wasn't able to create one,
  buffer all rows on client. Currently this is possible only for
  single row result sets and some SHOW commands.
sql/sql_prepare.cc:
  Properly free resources if there was a request to open a cursor which
  wasn't fullfilled.
  Give error on attempt to open a cursor for a statement not returning
  a result set.
sql/sql_select.h:
  Initialize Item_arena of Cursor object. A case when a cursor object
  is created but not used is possible with single-row result sets.
tests/mysql_client_test.c:
  Test cases for Bug#8880 and Bug#9159

into neptunus.(none):/home/msvensson/mysql/mysql-5.0