into mdk10.(none):/home/reggie/bk/50test2

client/mysqlshow.c:
  change to using mysql_real_escape_string
  Also, passing in length of from string "table" instead of to string "rows"

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


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

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


mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged

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

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

into mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged

  Fixed valgrind complaints. This fixes the memory leak problems for
  procedured, and partially for functions. There's still a leak involving
  results from functions that turned out to be too involved, so it will be
  fixed separately.


mysql-test/r/sp.result:
  Fixed some minor mistake (spotted while debugging).
mysql-test/t/sp.test:
  Fixed some minor mistake (spotted while debugging).
sql/item_func.cc:
  Moved Item_func_sp::cleanup() from item_func.h to ease debugging,
  and made a debug output come out right.
sql/item_func.h:
  Moved Item_func_sp::cleanup() to item_func.cc to ease debugging.
sql/sp_head.cc:
  Fixed valgrind problems with the previous memory leak fix (unit cleanup and
  putting result field in a differen mem_root), and removed prealloc flag from
  init_alloc_root() calls.
sql/sp_rcontext.cc:
  New mem_root pointer used for return fields from functions.
sql/sp_rcontext.h:
  New mem_root pointer used for return fields from functions.

into mysql.com:/home/omer/source/src50_0609


BitKeeper/etc/logging_ok:
  auto-union

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


mysql-test/Makefile.am:
  Auto merged

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

  the SSL tests pass

  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows


innobase/os/os0file.c:
  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows
innobase/os/os0sync.c:
  Apply Georg Richter's fixes to remove compilation errors on 64-bit Windows

    don't start ndb cluster if no test uses it.


mysql-test/mysql-test-run.sh:
  don't start ndb cluster if no test uses it.

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

key now gets changed along with the size of the field as long
as the original key had the same length as the length of the field
(or is unspecified originally, as in the test).


mysql-test/r/heap.result:
  Update results
mysql-test/r/type_varchar.result:
  Update results

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


mysys/hash.c:
  Auto merged
sql/ha_heap.h:
  Auto merged
configure.in:
  Resolve conflicts from 4.1
mysql-test/r/heap.result:
  Update results
mysql-test/t/heap.test:
  Merge from 4.1

  Corrected typo


VC++Files/sql/mysqld.dsp:
  Corrected typo

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-4.1-clean

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


mysql-test/r/ps_6bdb.result:
  Auto merged
include/my_global.h:
  SCCS merged

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

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/sql_acl.cc:
  Auto merged

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

- Removed unneccessary variables.
- Made a function of that part of code, which actually changes 
  the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
  was reserved.
- Fixed problem in case, when new option was added at the end
  of the section. Before, it was added as the last line of the
  section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
  if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
  Bug#10806

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


sql/mysql_priv.h:
  Auto merged

 - show_msg.inc   - displays a message followed by a line of '-' at the length of the messgae
 - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80


mysql-test/r/mysqltest.result:
  Updated result file
mysql-test/t/mysqltest.test:
  Added test cases to test the show_msg.inc and show_msg80.inc auxiliary files
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into xiphis.org:/usr/home/antony/work2/p1-bug11028.4

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0

into mysql.com:/var/tmp/sslbug/mysql-4.1

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0

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

  Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.


sql/sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.
mysql-test/r/select.result:
  Added a test case for bug #10084.
mysql-test/t/select.test:
  Added a test case for bug #10084.

BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
mysql-test/t/sql_mode.test:
  SCCS merged
sql/sql_acl.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged

No commit message