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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption

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

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

Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code. 


mysql-test/r/ps_1general.result:
  Redoing test output with straightened up output for storage engine names.
mysql-test/r/variables.result:
  Fixed test case.
sql/handler.cc:
  Couple of format cleanups and a change in a comment.

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

server-tools/instance-manager/buffer.cc:
  perform initialization of static consts in .cc file to respect VC6
server-tools/instance-manager/buffer.h:
  fix compiler warning
server-tools/instance-manager/commands.cc:
  fix compiler warning
server-tools/instance-manager/user_map.cc:
  fix compiler warning

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


sql/ha_federated.cc:
  Auto merged

Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches. 


sql/examples/ha_archive.cc:
  Now declared externally.
sql/examples/ha_example.cc:
  Now declared externally
sql/examples/ha_tina.cc:
  Now declared externally
sql/ha_berkeley.cc:
  Now declared externally
sql/ha_blackhole.cc:
  Now declared externally
sql/ha_federated.cc:
  Now declared externally.
sql/ha_heap.cc:
  Now declared externally.
sql/ha_innodb.cc:
  Now declared externally.
sql/ha_myisam.cc:
  Now declared externally
sql/ha_myisammrg.cc:
  Now declared externally.
sql/ha_ndbcluster.cc:
  Now declared externally.
sql/handler.cc:
  Changes for eventual loadable engines. This will allow us to gain faster access to the handlerton (eventually this will just be a handlteron array).
sql/handler.h:
  New alias structure and change to show_table_st to place handlerton in the structure.

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


client/mysqltest.c:
  Merged from 4.1.

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


client/mysqltest.c:
  Merged from 4.0.

  Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables

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


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

  Added flag --valgrind-mysqltest


mysql-test/mysql-test-run.pl:
  Added flag --valgrind-mysqltest

  big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 


ndb/src/ndbapi/Ndbinit.cpp:
  Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
  Protect NdbObjectIdMap::expand from getObjectId

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


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

  Bug#10504: additional test


mysql-test/t/ctype_utf8.test:
  Bug#10504: additional test
mysql-test/r/ctype_utf8.result:
  Bug#10504: additional test

into  mysql.com:/usr/home/bar/mysql-5.0.b10504

into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_view.cc:
  Auto merged

sql/parse_file.cc:
  Fix after discussion/review with Sanja: removed rename_view from sql_view to general function rename_in_schema_file
  (so it can be used for other .frm types like triggers too)
sql/parse_file.h:
  added prototype for rename_in_schema_file
sql/sql_rename.cc:
  simplified code (thanks to Sanja)
sql/sql_view.cc:
  moved rename_view_files to rename_in_schema_file (parse_file.cc)
  corrected MYF parameter from MY_WME to 0.

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

  Delete: man/which.2


BitKeeper/deleted/.del-which.2~463417adb2e37122:
  Delete: man/which.2

Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.


BUILD/SETUP.sh:
  Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
BUILD/autorun.sh:
  Change of syntax

  Enabled --valgrind to work (bug#13280)


mysql-test/mysql-test-run.pl:
  Enabled --valgrind to work (bug#13280)

into  127.(none):/home/osku/mysql/5.0/clean

mysql-test/r/view.result:
  test results for rename table view1 to view2
mysql-test/t/view.test:
  tests for rename table view1 to view2
sql/share/errmsg.txt:
  added new errormessage (schema change not allowed in rename table view)
sql/sql_rename.cc:
  added support for renaming views
sql/sql_view.cc:
  added new function mysql_rename_view
sql/sql_view.h:
  added prototype mysql_rename_view

into moonbone.local:/work/12291-bug-5.0-mysql

into mysql.com:/M50/mysql-5.0

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

sql/sql_show.cc:
  fixed typo
  fixed length detection

  Character set does not support traditional mode
ctype_utf8.result, ctype_utf8.test:
  adding test case.
password.c, mysql_com.h
  Changeing octet2hex availability from static to public.
item_strfunc.cc:
  Result string is now checked to be well-formed.
  Warning/error is generated, depending on sql_mode.


include/mysql_com.h:
  Bug#10504
  Character set does not support traditional mode
  Changeing octet2hex from static to public.
sql/item_strfunc.cc:
  Result string is now checked to be well-formed.
  Warning/error is generated, depending on sql_mode.
sql/password.c:
  Changeing octet2hex from static to public.
mysql-test/t/ctype_utf8.test:
  adding test case.
mysql-test/r/ctype_utf8.result:
  adding test case.

Optimizer did choose "Range checked for each record" for one of the tables.
For first few loops over that table it choose sequential access, on later
stage it choose to use index. Because table was previously initialized for 
sequential access, it skips intitialization for index access, and when
server tries to retrieve data error occurs.

QUICK_RANGE_SELECT::init() changes so if file already initialized for
sequential access, it calls ha_rnd_end() and initializes file for index
access.


sql/opt_range.cc:
  Fix bug #12291 Table wasn't reinited for index scan after sequential scan
mysql-test/t/select.test:
  Test case for bug #12291 Table wasn't reinited for index scan after sequential scan
mysql-test/r/select.result:
  Test case for bug #12291 Table wasn't reinited for index scan after sequential scan

into moonbone.local:/work/12887-bug-5.0-mysql