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

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/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/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

- 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/my50-bug22029


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

- 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.

scripts/mysql_fix_privilege_tables.sql:
  Remove annoying single '

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

client/mysql_upgrade.c:
  Send error messages to stderr
  Add new define EXTRA_CLIENT_PATHS containing additional paths where
  to look for the client binaries

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


client/mysqltest.c:
  Auto merged

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

"Y" are different) to utf8_general_ci (where same).


scripts/mysql_fix_privilege_tables.sql:
  Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and 
  "Y" are different) to utf8_general_ci (where same).  In the previous 
  statement, we clobber the collation to utf8_bin for all columns, and 
  that's the wrong thing to do for enums.

$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows


client/mysqltest.c:
  Add auto replace for $MYSQLTEST_VARDIR
  Only add strings with strlen > to patterns array - avoids
  lot of strlen calls

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

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport

Update usage description

mysql-test/mysql-test-run.pl:
  Don't require restart if master is not started when running with --extern

mysql-test/lib/mtr_cases.pl:
  Don't look at lines that start with # ie. a comment
mysql-test/mysql-test-run.pl:
  Set env BIG_TEST if --big-test passed

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

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


sql/mysqld.cc:
  Auto merged

 - Set environment variable BIG_TEST when using --big-test
 - Skip comment lines when looking for features a test case supports.


mysql-test/lib/mtr_cases.pl:
  Skip all lines that start with # when looking for features required by the test case
mysql-test/mysql-test-run.pl:
  Set environment variable BIG_TEST if option --big-test passed.

 - Dont require restart when using extern and there is no record of
   master being started(pid is not known) 


mysql-test/mysql-test-run.pl:
  Don't require restart when running against extern server and no
  record of master being started

(Bug #24294)

into  example.com:/work/bug24219/my50


sql/sql_table.cc:
  Auto merged

into  example.com:/work/bug24219/my41