into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/sql_parse.cc:
  Auto merged

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  merge fix

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


mysql-test/r/read_only.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/read_only.test:
  Manual merge

mysql-test/r/read_only.result:
  Removing non deterministic test results from test.
mysql-test/t/read_only.test:
  Removing non deterministic test results from test.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime


sql/sql_parse.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


Makefile.am:
  Auto merged
configure.in:
  null merge version change
scripts/mysql_install_db.sh:
  manual merge
scripts/mysql_system_tables_data.sql:
  manual merge

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/sql_parse.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


client/mysqldump.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build

into  adventure.(none):/home/thek/Development/cpp/bug27440/my51-bug27440


mysql-test/r/read_only.result:
  Manual merge
mysql-test/t/read_only.test:
  Manual merge
sql/sql_parse.cc:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


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

mysql-test/mysql-test-run.pl:
  Add a way to remove options which mysql-test-run.pl no longer uses.  Since
  mysql-test-run.pl passes unrecognized options through to mysqld directly,
  it is not possible to just remove an option.  Otherwise it would be given
  to mysqld, which probably will not recognize it and will fail to start.
  
  Instead, we now explicitly ignore the option, and print a warning to
  the user.

into  five.local.lan:/work/merge/mysql-5.1-build-parts

When read_only option was enabled, a user without SUPER privilege could
perform CREATE DATABASE and DROP DATABASE operations.

This patch adds a check to make sure this isn't possible. It also attempts to 
simplify the logic used to determine if relevant tables are updated,
making it more human readable.


mysql-test/r/read_only.result:
  Updated result file
mysql-test/t/read_only.test:
  A test case is added which shows that it is not possible to drop or create a
  database in read-only mode despite having the GRANT permissions to do so,
  SUPER user excepted.
sql/sql_parse.cc:
  - Simplified complex predicate by grouping it in a read friendly way.
  - Added predicate to fail on database updates while running in read-only
    mode.

into  trift2.:/MySQL/M51/push-5.1

    Makefile syntax error, comment should precede the whole target.


Makefile.am:
  Makefile syntax error, comment should precede the whole target.

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1


mysql-test/t/disabled.def:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/grant.result:
  Manual merge
mysql-test/t/grant.test:
  Manual merge

    In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.


Makefile.am:
  In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
  
  Reason:
  For release builds, we run the tests in a tree that contains just a binary installation.
  So the Makefile is not in the test tree, and we explicitly address it in the build tree.
  This explicit path is not kept by "make", so it is missing in the sub-make.
  There seems to be no way to solve this with (portable!) "make" features -
  we could add a new variable and use it in the sub-make, but it is easier to duplicate these few lines.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/sql_table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


mysql-test/t/grant.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/grant.result:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


strings/ctype-simple.c:
  use local (null merge)

mysql-test/r/grant.result:
  Update test results to .test changes
mysql-test/t/grant.test:
  Drop users when done with them, to avoid skewing results of later tests.
  
  For example, running some test which examines the cardinality of the
  mysql.user table would fail if run right after this test, due to the
  extra users.

testing embedded server works correctly.


mysql-test/r/create.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/r/grant.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/create.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/grant.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).

sql/sql_select.cc:
  Fix compiler warning (probably harmless, wrong integer size)

strings/ctype-simple.c:
  Backport quick fix to remove Windows compiler warnings.

   Bug#32856 testsuite parts: partition_basic_myisam fails 
                              in pushbuild
Skip test if symlink support is missing.


mysql-test/suite/parts/t/partition_basic_myisam.test:
  Skip test if running on a server with disabled symlinking.

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged