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

This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).


mysql-test/r/mix_innodb_myisam_binlog.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_change_master.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_deadlock.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_error_ignored_table.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_flush_log_loop.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_loaddata.result:
  we now use one less byte when storing the catalog in binlog so positions change.
  Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
mysql-test/r/rpl_log.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_max_relay_size.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_relayrotate.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_replicate_do.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_rotate_logs.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_until.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/mysqlbinlog.test:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/mysqlbinlog2.test:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/rpl_deadlock.test:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/rpl_loaddata.test:
  we now use one less byte when storing the catalog in binlog so positions change.
  Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
mysql-test/t/rpl_until.test:
  we now use one less byte when storing the catalog in binlog so positions change
sql/log_event.cc:
  a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
  This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4
  are explained in the comments in this file.
  b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
  been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
  before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
  c) if slave fails in Execute_load_query_log_event::exec_event(),
  don't delete the file (so that it's re-usable at next START SLAVE).
sql/log_event.h:
  We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
  This saves one byte per Query_log_event on disk. This new storage for
  the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE
  as 5.0.3 slaves of this 5.0.4 master would segfault because it would
  expect a 0 when there is none.
  Renaming get_open_mode() to get_create_or_append() (see log_event.cc)
sql/sql_load.cc:
  Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table
  (i.e. has deleted/added/modified some rows in a non-transactional table),
  we must write an Execute_load_query_log_event to binlog (with the error code,
  as this class beautifully inherits from Query_log_event, it can store
  the error code - thanks Dmitri) and not a Delete_file_log_event (we use
  to write a Delete_file_log_event: no update happened on slave, bug).

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 neptunus.(none):/home/msvensson/mysql/mysql-4.1

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

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


sql/mysqld.cc:
  Auto merged

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

server" to the test suite, the bug is no longer repeatable.


tests/mysql_client_test.c:
  The test case for Bug#8722 "prepared statement with view crashes server"

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

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

"Server crashes when running out of connections"


sql/sql_class.cc:
  thd->query_id is compared with thd->warn_id in push_warning, 
  THD::THD seems to be the best place to fix it.

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


sql/ha_innodb.cc:
  Auto merged

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

into mysql.com:/media/sda1/mysql/mysql-5.0-6282