mysql-test/t/rpl_sp004.test:
  updated to work with default NDB engine
mysql-test/r/rpl_sp004.result:
  updated to work with default NDB engine
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Updated to skip when ndb is default
mysql-test/t/rpl_multi_engine.test:
  Results will not match when ndb is default do to myisam table creates and show create
mysql-test/t/rpl_row_basic_11bugs.test:
  Disables for when ndb is default as the show binlog events will cause failure

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

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

  Remove comments not needed


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove comments not needed

  Correct fix for test bug #19158


mysql-test/extra/rpl_tests/rpl_log.test:
  Correct fix for test bug #19158

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


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

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


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

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

by a dirty word, and it complains about it, even in a comment.

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.

sql/sql_show.cc:
  Add the variable "limited_mysql_mode" to function 'store_create_info'

into mysql.com:/M51/mysql-5.1

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


mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge 5.0 -> 5-1
mysql-test/t/mysqldump.test:
  Manual merge 5.0 -> 5-1

into  neptunus.(none):/home/msvensson/mysql/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

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

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

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


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

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