into  linux.site:/home/marty/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/default.c:
  Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs 


mysql-test/r/type_bit.result:
  test case.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
mysql-test/t/type_bit.test:
  test case.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
sql/field.h:
  a fix.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs 
  
  - max_length() returns length in bits.
  - introduced set_bit_ptr() function, which sets bit_ptr and bit_ofs.
sql/item.cc:
  a fix.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
  
  - create Field_bit_as_char in case of MYSQL_TYPE_BIT in the Item::tmp_table_field_from_field_type()
    (we cannot create Field_bit here because of lack of information: bit_ptr, bit_ofs)
sql/mysql_priv.h:
  a fix.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs 
  
  - table_cant_handle_bit_fields parameter added to the create_tmp_field()
sql/sql_select.cc:
  a fix.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
  
  - create_tmp_field() changes to return create_tmp_field_from_item() result 
    (actually, Field_bit_as_char) if table_cant_handle_bit_fields=1 for bit fields.
  - create_tmp_field() calls accordingly changed 
  - call set_bit_ptr() for bit fields after the move_field() call during 
    temporary table creation.
sql/sql_table.cc:
  a fix.
  bug #10617: Insert from same table to same table give incorrect result for bit(4) column.
  bug #11091: union involving BIT: assertion failure in Item::tmp_table_field_from_field_type
  bug #11572: MYSQL_TYPE_BIT not taken care of in temp. table creation for VIEWs
  
  - changed the create_tmp_field() call

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

configure.in:
  Bump required version of autoconf to 2.58(same as in 4.1 and as in the manual)

client/mysqldump.c:
  Moved variable declaration to beginning of block (and removed const to get rid of warnings).
client/mysqltest.c:
  Moved DBUG_PRINT after variable declarations.

include/config-netware.h:
  Netware related fix. Some changes needed when building against latest libc (June 2005)
netware/my_print_defaults.def:
  Stack size increase.
sql/mysqld.cc:
  Needed with latest libc.

into mysql.com:/home/cps/mysql/trees/mysql-5.0

mysys/default_modify.c:
  post review fixes

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0

sql/sp_head.cc:
  execute parameters in statement mem_root
sql/sql_union.cc:
  additional assert

into mysql.com:/usr/home/ram/work/mysql-5.0

sql/item.cc:
  a fix (bug #11215: BIGINT: can't set DEFAULT to minimum end-range)
  Pass unsig=1 to the constructor.

(The bug itself was fixed earlier by the patch that fixed bug #5860
 "Multi-table UPDATE does not activate update triggers" and several
 other bugs). 


mysql-test/r/trigger.result:
  Added test for bug #5893 "Triggers with dropped functions cause crashes"
mysql-test/t/trigger.test:
  Added test for bug #5893 "Triggers with dropped functions cause crashes"

mysys/default_modify.c:
  post revew fixes to a patch

into rurik.mysql.com:/home/igor/mysql-5.0


sql/opt_range.cc:
  Auto merged

  Fixed a compilation error.


sql/opt_range.cc:
  Fixed a compilation error.

sql/opt_range.cc:
  comment fixed.
sql/sp_head.cc:
  An obsolete comment removed.

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/opt_range.cc:
  Auto merged

CURSOR_TYPE_READ_ONLY select within select".
The bug was caused by the reset of thd->mem_root to thd->main_mem_root in 
Item_subselect::exec, which in turn triggered too early free_root() for
data which was needed on subsequent fetches from a cursor.
This reset also caused a memory leak in stored procedures, as 
subsequent executions of instructions containing a subselect
were allocating memory in thd->main_mem_root, which is not freed
until the end of the entire SP, instead of the per-call mem_root,
which is freed in the end of execution of the instruction.


sql/item_subselect.cc:
  Don't try to protect subqueries from the code that assumes that
  it can reset thd->mem_root and get away with it: it's responsibility
  of the caller to ensure that no assumption about the life span
  of the allocated memory made by the called code is broken.
  Besides, this didn't work well with cursors and stored procedures, 
  where the runtime memory root is not the same as &thd->main_mem_root.
sql/opt_range.cc:
  In get_mm_leaf restore the original mem_root of the thd which has
  been temporarily reset with the quick select mem_root earlier: if 
  thd->mem_root points to the QUICK...::mem_root, the memory allocated
  in JOIN::exec during evaluation of a subquery gets freed too early.
tests/mysql_client_test.c:
  A test case for Bug#10736 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY
   select within select"

  Added a test case for bug #10031.
opt_range.cc:
  Fixed bug #10031: range condition was not used with
  views. Range analyzer did not take into account that
  view columns were always referred through Item_ref.


sql/opt_range.cc:
  Fixed bug #10031: range condition was not used with
  views. Range analyzer did not take into account that
  view columns were always referred through Item_ref.
mysql-test/t/range.test:
  Added a test case for bug #10031.
mysql-test/r/range.result:
  Added a test case for bug #10031.

into hundin.mysql.fi:/home/marko/mysql-5.0-current


innobase/fil/fil0fil.c:
  SCCS merged
innobase/include/os0file.h:
  SCCS merged
innobase/os/os0file.c:
  SCCS merged

sql/mysqld.cc:
  Fix typo

  Remove compiler warnings on Windows - Bug #11580


innobase/btr/btr0btr.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/btr/btr0cur.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/fil/fil0fil.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/ibuf/ibuf0ibuf.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/log/log0recv.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/os/os0file.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/page/page0page.c:
  Remove compiler warnings on Windows - Bug #11580
innobase/row/row0upd.c:
  Remove compiler warnings on Windows - Bug #11580

innobase/os/os0file.c:
  os_file_set_size(): After review fixes (prevent overflows)

up CREATE TABLE in innodb_file_per_table=1 mode.


innobase/fil/fil0fil.c:
  fil_extend_space_to_desired_size(): Do not allocate or initialize
  more memory than is necessary.  Write at most one megabyte at a time.
innobase/include/os0file.h:
  os_file_set_size(): Corrected the synopsis
innobase/os/os0file.c:
  os_file_set_size(): Corrected the synopsis and some comments.
  s/offset/current_size; s/low/desired_size/;
  Do not allocate or initialize more memory than is necessary.
  Write at most one megabyte at a time.

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

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


client/mysqltest.c:
  Auto merged

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


client/mysqltest.c:
  Auto merged
sql/sql_base.cc:
  Auto merged

sql/sql_parse.cc:
  Just do a simple sprintf to format error message.

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


mysql-test/r/alias.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

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

mysql-test/r/client_xml.result:
  Update testresult
mysql-test/r/ndb_autodiscover.result:
  Moving order opf test results to match test execution order

sql/sql_select.cc:
  If we use subqueries, we can have double-free of tmp_table_param.copy_field
  in JOIN::destroy and in JOIN::join_free because.

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


mysql-test/mysql-test-run.sh:
  Auto merged

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

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0