InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts

  Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log


mysql-test/mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
  Made --timer work

the time spent in the various steps.


Build-tools/Do-compile:
  Add information to the log file that allows to calculate the time spent in the
  various steps:
  
  1) Introduce a global variable 'global_step'.
  2) Before each major step, set it to some descriptive value.
  3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
     "DONE", or "ABORT") and append that to the timestamp in the log file,
     followed by the contents of 'global_step'.
  4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
  5) Add 'log_timestamp("DONE");' calls after the relevant steps.
  6) Add 'log_timestamp("ABORT");' calls to the error exits.

not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes.


mysql-test/r/func_str.result:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
  
  Also, a mistake in EXPORT_SET was fixed.
mysql-test/t/func_str.test:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
sql/item_func.cc:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
sql/item_strfunc.cc:
  Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
  not always correct for NULL values.
  
  A minor mistake in EXPORT_SET() was fixed.

fixed result_field support of Item_ref

into mysql.com:/usr/home/bar/mysql-4.1-bug8785

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

sql_show.cc:
  changed strdup to thd->memdup per Serg's advice


sql/sql_show.cc:
  changed strdup to thd->memdup per Serg's advice

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

into mdk10.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.


sql/sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
client/mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660

character set conversion of a string constant.


mysql-test/r/ctype_utf8.result:
  Adding test
mysql-test/t/ctype_utf8.test:
  Addign test
sql/item_strfunc.cc:
  Remove previous fix: it was not 100% correct.
  A non const_item() can return a constant String.
sql/sql_string.h:
  A new method to cut Alloced_length to str_length for
  string constants, to avoid reusing them as a buffer
  in things like CONCAT().

into hundin.mysql.fi:/home/marko/mysql-4.1

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX):
  Two identical declarations on loop level will collide at function level.

sql/filesort.cc:
  A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end).              
  Should call ha_rnd_end() only if ha_rnd_init() was called.

  "mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)


Build-tools/Do-solaris-pkg:
  - fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
    (thanks to Kent for the suggestion)

Applied some changes to the mysql.server init script that are already shipped as an additional patch
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)


support-files/mysql.server.sh:
  - small improvement: use LSB functions to display startup success and failure, if available.
    Fall back to builtin functions otherwise.
  - joined two pieces of code performing the same functionality into one "wait_for_pid" function
  - added a "reload" function (LSB requirement)

into mysql.com:/usr/home/ram/work/4.1.b8799

heap/hp_create.c:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
include/heap.h:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.
sql/ha_heap.cc:
  A fix (bug #8489: Strange auto_increment behaviour with HEAP table).
  Handle autoincrement keys MyISAM-way.

into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/dict/dict0load.c:
  SCCS merged

  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user


innobase/buf/buf0flu.c:
  Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user

into mysql.com:/home/psergey/mysql-4.1-bug8510

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

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


BitKeeper/etc/logging_ok:
  auto-union

  Fix path that needs no parameterization.


man/mysql.1.in:
  Fix path that needs no parameterization.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/psergey/mysql-4.1-bug8510


sql/set_var.cc:
  Auto merged

This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c

mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows


client/mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.

 - Moved static variables defined inside of function to file scope to avoid this linking problem on FC3


sql/ha_berkeley.cc:
  Moved list of bdb extension to file scope
sql/ha_ndbcluster.cc:
  Moved list of ndb extesions to file scope
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
  of MySQL 5.0.3 and later.


innobase/dict/dict0load.c:
  dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
  of MySQL 5.0.3 and later.

correct top_level_item for XOR


mysql-test/r/join_outer.result:
  one more test
mysql-test/t/join_outer.test:
  one more test

  Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.


sql/item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
mysql-test/t/join_outer.test:
  Added a test case for bug #9017.
mysql-test/r/join_outer.result:
  Added a test case for bug #9017.

into mysql.com:/home/jimw/my/mysql-4.1-clean

sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge tests