into  big_geek.:C:/Work/mysql/mysql-5.1


include/my_base.h:
  Auto merged

BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc

into  linux.site:/home/reggie/work/mysql-5.1-test

into  mysql.com:/home/psergey/mysql-5.1-merge6

into  mysql.com:/home/psergey/mysql-5.1-merge6


configure.in:
  Auto merged

into  big_geek.:C:/Work/mysql/mysql-5.1-test

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

into  mysql.com:/home/psergey/mysql-5.1-merge6

into  mysql.com:/home/psergey/mysql-5.1-merge6


mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
This is being pushed to a private tree and tested before being sent to the mainline.


client/CMakeLists.txt:
  Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt
libmysql/CMakeLists.txt:
  Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt:
  Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt
sql/CMakeLists.txt:
  Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt
zlib/CMakeLists.txt:
  Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt
extra/CMakeLists.txt:
  Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt
tests/CMakeLists.txt:
  Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt
extra/yassl/CMakeLists.txt:
  Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt:
  Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt
storage/heap/CMakeLists.txt:
  Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt
storage/myisam/CMakeLists.txt:
  Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt:
  Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt
storage/csv/CMakeLists.txt:
  Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt
storage/innobase/CMakeLists.txt:
  Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt:
  Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt
libmysqld/examples/CMakeLists.txt:
  Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt
vio/CMakeLists.txt:
  Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt
dbug/CMakeLists.txt:
  Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt
strings/CMakeLists.txt:
  Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt
regex/CMakeLists.txt:
  Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt
mysys/CMakeLists.txt:
  Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt
storage/archive/CMakeLists.txt:
  Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt
storage/bdb/CMakeLists.txt:
  Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt
storage/blackhole/CMakeLists.txt:
  Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt
storage/example/CMakeLists.txt:
  Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt
CMakeLists.txt:
  Rename: cmakelists.txt.tmp -> CMakeLists.txt

bringing handlerton-win.cc back after incorrectly deleteing it.  It is not needed for 5.1 or later but is used by 5.0 


sql/handlerton-win.cc:
  Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc

into  mysql.com:/home/psergey/mysql-5.1-merge5

into  mysql.com:/home/psergey/mysql-5.1-merge5


sql/sql_select.cc:
  Auto merged

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  siva.hindu.god:/usr/home/tim/m/51/a.bug6061

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  siva.hindu.god:/usr/home/tim/m/51/a.bug6061

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

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

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

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