into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061

- Fix mysqld_safe so that it always passes correct --log-error argument to mysqld
- A few other minor clean-ups to mysqld_safe


scripts/mysqld_safe.sh:
  Bug #6061 mysql-log-rotate script - error logging doesn't use new file
  
  - Change mysqld_safe to pass --log-error to mysqld in all cases.  The old behavior was to usually "swallow" the --log-error=file.name argument, which caused mysqld to write to stderr and not be able to flush the error log file.  Ironically, passing --log-error (with no file name) seemed to work fine, because mysqld_safe didn't recognize it and passed it on to mysqld as an unknown option.
  - Ensure that the error log file matches what mysqld uses; in particular, add ".err" if given a --log-error argument with no extension, and add "$DATADIR" to the front of a relative path
  - Various other mysqld_safe clean-ups while there - quote arguments properly, remove some redundant code

into mysql.com:/M51/mysql-5.1

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1

unittest/examples/no_plan.t.c:
  Ensure that the "configure" result is used when compiling this module.
unittest/examples/skip_all.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/examples/todo.t.c:
  Ensure that the configure result is used when compiling this module.
unittest/mytap/t/basic.t.c:
  Ensure that the configure result is used when compiling this module.

into mysql.com:/M51/mysql-5.1

into  mysql.com:/home/kgeorge/mysql/5.1/B18068


sql/sql_select.cc:
  Auto merged

When converting DISTINCT to GROUP BY where the columns are from the covering
index and they are quoted twice in the SELECT list the optimizer is creating
improper processing sequence. This is because of the fact that the columns
of the covering index are not recognized as such and treated as non-index
columns.

Generally speaking duplicate columns can safely be removed from the GROUP
BY/DISTINCT list because this will not add or remove new rows in the
resulting set. Duplicates can be removed even if they are not consecutive
(as is the case for ORDER BY, where the duplicate columns can be removed
only if they are consecutive).

So we can safely transform "SELECT DISTINCT a,a FROM ... ORDER BY a" to
"SELECT a,a FROM ... GROUP BY a ORDER BY a" instead of 
"SELECT a,a FROM .. GROUP BY a,a ORDER BY a". We can even transform 
"SELECT DISTINCT a,b,a FROM ... ORDER BY a,b" to
"SELECT a,b,a FROM ... GROUP BY a,b ORDER BY a,b".

The fix to this bug consists of checking for duplicate columns in the SELECT
list when constructing the GROUP BY list in transforming DISTINCT to GROUP
BY and skipping the ones that are already in.


mysql-test/r/distinct.result:
  test case for the bug without loose index scan
mysql-test/r/group_min_max.result:
  test case for the bug
mysql-test/t/distinct.test:
  test case for the bug without loose index scan
mysql-test/t/group_min_max.test:
  test case for the bug
sql/sql_select.cc:
  duplicates check and removal

BUILD/autorun.sh:
  Add libtoolize/glibtoolize hook for InnoDB auto-stuff too

into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged

configure.in:
  Now that 5.1.10 has been cloned, bump up the version.

  autotool-ize plugins before the main source tree


BUILD/autorun.sh:
  autotool-ize plugins before the main source tree

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

storage/archive/plug.in:
  MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
storage/example/plug.in:
  MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically

into  mysql.com:/home/mydev/mysql-5.1-bug10405


storage/myisam/mi_check.c:
  Auto merged

- ndb system tables not created because of filter, moved chack of filter

into  mysql.com:/home/my/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)


mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
  Added extra test + drop of table at end of test
mysql-test/lib/mtr_report.pl:
  Fail if mysqld asserts or prints stack
mysql-test/mysql-test-run.sh:
  Fail if mysqld asserts or prints stack
mysql-test/r/exampledb.result:
  Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/r/innodb.result:
  Extra test to see that we can do an optimize table on an active transaction
mysql-test/r/rpl_failed_optimize.result:
  Added extra test + drop of table at end of test
mysql-test/t/exampledb.test:
  Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/t/innodb.test:
  Extra test to see that we can do an optimize table on an active transaction
sql/handler.cc:
  Don't use row level logging on optimize or repair table.
sql/log.cc:
  Simplify code (no logic changes)
sql/mysql_priv.h:
  Added prototype
sql/sql_base.cc:
  Better name for define
sql/sql_class.cc:
  Indentation fix
sql/sql_parse.cc:
  Make end_active_trans() global
sql/sql_table.cc:
  Ensure we end active transcations if we do an admin command (like optimize, repair etc)

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

    fixed memleak in ndbcluster_end


mysql-test/mysql-test-run.pl:
  do not install ndb slave if no slaves
sql/ha_ndbcluster.cc:
  fixed memleak in ndbcluster_end

Bug #18798: mysqld cores on update in ha_ndbcluster call if cluster has failed before, added extra check that transaction is started

into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

into  mysql.com:/home/mydev/mysql-5.1-bug10405