VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/mysys/mysys_ia64.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_multi_delete2.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/mysql-test-run.pl:
  Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.

into mysql.com:/home/psergey/mysql-4.1-csc6030-r3


sql/mysqld.cc:
  Auto merged

statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)


include/myisam.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/mi_check.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/myisamchk.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/r/myisam.result:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/t/myisam.test:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/ha_myisam.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/handler.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/mysqld.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/set_var.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/sql_class.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics

into  selena.:H:/MYSQL/src/#12929-mysql-4.1


include/my_sys.h:
  Auto merged

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139

into moonbone.local:/work/13218-bug-4.1-mysql

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

  
This is backport from 5.0 of fix for bug #11039


mysql-test/t/innodb.test:
  Backport from 5.0 of test case for bug#11039
mysql-test/r/innodb.result:
  Backport from 5.0 of test case for bug#11039
sql/opt_sum.cc:
  Fix bug #13218:  backport from 5.0 of bug #11039 fix

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

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139


mysql-test/r/rpl_multi_delete2.result:
  Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged

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.