Disabled test cases that produce errors in a "server log".


mysql-test/t/disabled.def:
  Post-merge fixes
  Removed 'binlog_innodb' from the wrong disabled.def file.

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

Disabled a test that reports Slave SQL error in warnings file.

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

Disabled tests which break automatic merging due to
non-empty warnings file.

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_update.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
mysql-test/suite/parts/r/rpl_partition.result:
  Auto merged
mysql-test/suite/parts/t/rpl_partition.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.1-engines


sql/sql_class.cc:
  Manual merge.

pseudo_thread_id was reset to zero via mysql_change_user() handling
whereas there is no reason to do that.  Moreover, having two
concurrent threads that change user and create a namesake temp tables
leads to recording the dup pair of queries:

   set @@session.pseudo_thread_id = 0;
   CREATE temporary table `the namesake`;

which will stall the slave as the second instance can not be created.
And that is the bug case.

Fixed by correcting pseudo_thread_id value after mysql_change_user().


sql/sql_class.cc:
  Fixed that pseudo_thread_id was set to 0 after mysql_change_user().

into  chilla.local:/home/mydev/mysql-5.1-bug28810

            hangs 100% cpu

Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
character set.


mysql-test/r/fulltext.result:
  Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
  character set.
mysql-test/r/fulltext3.result:
  Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
  character set.
mysql-test/t/fulltext.test:
  Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
  character set.
mysql-test/t/fulltext3.test:
  Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
  character set.

Part 2:
Searching fulltext index for a word with boolean mode truncation
operator may cause infinite loop.

The problem was that "smarter index merge" was used with "trunc-words",
which must never happen.

Affects 5.1 only.


mysql-test/r/fulltext.result:
  Addition to a test case for BUG#29445.
mysql-test/t/fulltext.test:
  Addition to a test case for BUG#29445.
storage/myisam/ft_boolean_search.c:
  Fulltext "smarter index merge" optimization assumes that rows
  it gets are ordered by doc_id. That is not the case when we
  search for a word with truncation operator. It may return
  rows in random order. Thus we may not use "smarter index merge"
  optimization with "trunc-words".
  
  Also fixed compiler warning introduced by Part 1 patch.

into  chilla.local:/home/mydev/mysql-5.1-bug28810

        causing wrong error message in Falcon

An error message about a duplicate key could show a wrong key
value when not all columns of the key were used to select the
rows for update.

Some storage engines return a record with only the selected
columns filled.

This is fixed by re-reading the record with a read_set which
includes all columns of the duplicate key after a duplicate key
error happens and before the error message is printed.


mysql-test/r/ndb_update.result:
  Bug#28158 - table->read_set is set incorrectly,
              causing wrong error message in Falcon
  Added test result.
mysql-test/t/ndb_update.test:
  Bug#28158 - table->read_set is set incorrectly,
              causing wrong error message in Falcon
  Added test from falcon_bug_28158.
sql/sql_update.cc:
  Bug#28158 - table->read_set is set incorrectly,
              causing wrong error message in Falcon
  Added a function for re-reading a record with a read_set
  that contains all fields used by a duplicate key.
  Called the function before every call to handler::print_error(),
  which could print a duplicate key value.

to work for queries like "+a (b)"


mysql-test/r/fulltext.result:
  second test for BUG#29445
mysql-test/t/fulltext.test:
  second test for BUG#29445
storage/myisam/ft_boolean_search.c:
  fix for smarter index merge, to work for queries like "+a (b)"

into  mysql.com:/home/svoj/devel/mysql/BUG29445/mysql-5.1-engines

Part 1:
Do not perform index search for a plus-word with truncation operator
in case there are other plus-words in expression.

Specifically this optimization was enforced for expression like
"+word1 +word2*", but wasn't enforced for expression like
"+word1 word2*".


mysql-test/r/fulltext.result:
  A test case for BUG#29445.
mysql-test/t/fulltext.test:
  A test case for BUG#29445.
storage/myisam/ft_boolean_search.c:
  Do not perform index search for a plus-word with truncation operator
  in case there are other plus-words in expression.
  
  Specifically this optimization was enforced for expression like
  "+word1 +word2*", but wasn't enforced for expression like
  "+word1 word2*".

into  mysql.com:/home/ram/work/mysql-5.1-maint

Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.


mysql-test/r/csv.result:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - test result adjusted.
storage/csv/ha_tina.cc:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - adjust local_saved_data_file_length in case of update as well.
storage/csv/ha_tina.h:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - adjust local_saved_data_file_length in case of update as well.

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


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged

- correct result files

Dont touch & chmod the err_log file if using syslog (mysqld_safe)


scripts/mysqld_safe.sh:
  Dont touch & chmod the err_log file if using syslog

into  sita.local:/Users/tsmith/m/bk/maint/51

into  sita.local:/Users/tsmith/m/bk/maint/50

  Fix a few typos in comments (from Paul DuBois)


scripts/mysqld_safe.sh:
  Fix a few typos in comments (from Paul DuBois)

into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/suite/rpl/r/rpl_misc_functions.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Auto merged

  Backport from 5.1 a fix to make this test deterministic


mysql-test/r/rpl_misc_functions.result:
  Backport from 5.1 a fix to make this test deterministic
mysql-test/t/rpl_misc_functions.test:
  Backport from 5.1 a fix to make this test deterministic

into  sita.local:/Users/tsmith/m/bk/maint/51


sql/log.cc:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/50

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  mysql.com:/home/svoj/devel/mysql/BUG29464/mysql-5.1-engines

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