into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged

into  polly.local:/tmp/maint/bug22077/my51-bug22077


mysql-test/t/read_only.test:
  Auto merged
sql/sql_parse.cc:
  Manual merge

into  ymer.(none):/usr/local/mysql/tmp/mysql-5.1-new-maint


mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca


mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.


mysql-test/lib/mtr_io.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
mysql-test/mysql-test-run.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.

into  example.com:/work/bug24396/my51

mysql-test/t/events_bugs.test:
  increase wait time..this had to be > 0.7

into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug21789/my51-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug21789/my50-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  merging

into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029

into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029

into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


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

into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

- Use more appropriate test case.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Result.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Test

into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029


sql/item_timefunc.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


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

- Post Merge Fix.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Post merge fix.

into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029


mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/date_formats.result:
  merging

into  mysql.com:/usr/home/ram/work/bug22029/my50-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  merging

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19799/my51-bug19799


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

- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.


client/readline.cc:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - When removing the '\n' character, check for and remove preceeding '\r' 
  character as well.
mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Results.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Tests.
mysql-test/t/mysql_delimiter_19799.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - File containing delimiter statement followed by '\r\n' line ending.

old upgrade behaviour.
Add test for upgrade from 5.0.30


mysql-test/t/system_mysql_db_fix40123.test:
  Drop alos the new 5.1 tables after test
scripts/mysql_fix_privilege_tables.sql:
  Update 5.1 version of mysql_fix_privilege_tables.sql to also do 
  an "ALTER TABLE MODIFY" on the new column(s) it adds. This allows us to 
  make sure that both new and already existing columsn get the right type.
mysql-test/t/system_mysql_db_fix50030-master.opt:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030-master.opt''
mysql-test/t/system_mysql_db_fix50030.test:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030.test''

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged

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


client/mysqltest.c:
  Auto merged

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


client/mysqltest.c:
  Auto merged

columns to make sure they both exist and have the intended type 


scripts/mysql_fix_privilege_tables.sql:
  Can't attempt to MODIFY columns of a table before they exists. The
  new column's Create_view_priv,Show_view_priv, Create_routine_priv,
  Alter_routine_priv and Create_user_priv might not exists when
  upgrading. Thus an ALTER TABLE MODIFY is added in addition to the
  ALTER TABLE ADD that would have added them if they didn't exist.
  In this way can be sure the columns both exist and are of the correct type

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


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

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

mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform. 


mysql-test/t/system_mysql_db_fix30020-master.opt:
  Rename: mysql-test/t/system_mysql_db_fix-master.opt -> mysql-test/t/system_mysql_db_fix30020-master.opt
mysql-test/mysql-test-run.pl:
  Find mysql_fix_privilege_tables.sql and assign it's path and name to $MYSQL_FIX_PRIVILEGE_TABLES
mysql-test/t/system_mysql_db_fix30020.test:
  Send output to var/log/system_mysql_db_fix30020.err
  Add some more comments
mysql-test/t/system_mysql_db_fix40123-master.opt:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix40123-master.opt''
mysql-test/t/system_mysql_db_fix40123.test:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix40123.test''

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged

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


client/mysqltest.c:
  Auto merged