- When a shared library argument is supplied, it's checked for an OS
specific directory separator.  The expected error is different
depending on the separator used. Created OS specific versions of these
tests.


mysql-test/r/ps.result:
  Bug#23983 ps.test fails to open shared library.
  - Moving to OS specific results.
mysql-test/r/windows.result:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific result for shared library argument with path
mysql-test/t/ps.test:
  Bug#23983 ps.test fails to open shared library.
  - Moving to OS specific tests.
mysql-test/t/windows.test:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific test for shared library argument with path
mysql-test/r/ps_not_windows.result:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific result for shared library argument with path
mysql-test/t/ps_not_windows.test:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific test for shared library argument with path

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote

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.1-new-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/my51

into  example.com:/work/bug24219/my50


sql/sql_table.cc:
  Auto merged

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

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


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

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


mysql-test/mysql-test-run.pl:
  Manual merge of backport

into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Manual merge of fix for location of mysql_client_test

  - have to explicitly set null_value.

into  example.com:/work/bug24219/my51


mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/alter_table.result:
  manual merge

(this is the 5.0 patch, because 4.1 differs)
  
There was an improper order of doing chained operations.
  
To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.


mysql-test/r/alter_table.result:
  post-merge fix
  my locale is utf8, and this breaks non-utf8 stuff when doing manual merge :(
sql/sql_table.cc:
  If there is operation on the KEYS, first do it
  and then do a rename if there is such. Or, we will crash because
  the underlying table has changed.

into  example.com:/work/bug24219/my50


mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  manual merge
mysql-test/r/alter_table.result:
  manual merge

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

There was an improper order of doing chained operations.

To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.


mysql-test/r/alter_table.result:
  update result
mysql-test/t/alter_table.test:
  add test for bug#24129
sql/sql_table.cc:
  If there is operation on the KEYS, first do it
  and then do a rename if there is such. Or, we will crash because
  the underlying table has changed.

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

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


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

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


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

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


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

mysql-test/r/sp.result:
  update result

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/item_func.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/item_func.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my51-bug19955


mysql-test/r/bigint.result:
  Auto merged
sql/item_func.cc:
  Auto merged

Problem:  When we have a really large number (between 2^63 and 2^64)
as the left side of the mod operator, it gets improperly corerced
into a signed value.

Solution:  Added check to see if the "negative" number is really
positive, and if so, cast it.


mysql-test/r/bigint.result:
  Added test case result
mysql-test/t/bigint.test:
  Added test case
sql/item_func.cc:
  Added check to see if we have an unsigned number that looks like a
  signed number.

mysql-test/r/rpl_sp.result:
  manual merge

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456