into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl

Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after


mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
mysql-test/t/rpl_extraCol_innodb-master.opt:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb-master.opt
mysql-test/t/rpl_extraCol_innodb-slave.opt:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb-slave.opt
mysql-test/t/rpl_extraCol_innodb.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb.test
mysql-test/t/rpl_extraCol_myisam.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_myisam.test
mysql-test/r/rpl_extraCol_innodb.result:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_extraCol_innodb.result
mysql-test/r/rpl_extraCol_myisam.result:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_extraCol_myisam.result
mysql-test/r/rpl_ndb_extraCol.result:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_ndb_extraCol.result
mysql-test/t/rpl_ndb_extraCol.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_ndb_extraCol.test
mysql-test/extra/rpl_tests/rpl_ndb_ddl.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/extra/rpl_tests/rpl_ndb_ddl.test

into  mysql.com:/usr/home/bar/mysql-5.1-rpl

mysql-test/r/lowercase_table.result:
  Adjusting to 5.1: DEFAULT is now printed in upper case.
mysql-test/t/rpl_ignore_table.test:
  After merge fix

into  mysql.com:/usr/home/bar/mysql-5.1-rpl


BitKeeper/etc/collapsed:
  auto-union
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
mysql-test/t/rpl_ignore_table.test:
  After merge fix.
sql/slave.cc:
  After merge fix

into  mysql.com:/usr/home/bar/mysql-5.1-rpl

strings/ctype-utf8.c:
  Fix for compilation warning -
  forgot to add a new structure member
  in one of the previous changes.

into  mysql_cab.:C:/source/c++/mysql-5.1-BUG_23735

client/mysqlbinlog.cc:
  BUG#23735 Corrections to comments in code for explaination of fix.

Changes to the code are necessary to compile on Windows. Typecasts are needed in several DBUG_DUMP statements. CAB 01 Nov 2006


sql/log_event.cc:
  The changes are so that the code will compile on Windows. Typecasts are needed on the DBUG_DUMP statements to cast a byte * to a char *.
sql/sql_class.cc:
  The changes are necessary to get the code to compile on Windows. The DBUG_DUMP statements need a typecast.

BUG#23735 Test rpl_row_mysqlbinlog fails on Windows. The errors report a file discrepency on reading a binlog from the command line.


client/mysqlbinlog.cc:
  BUG#23735 Test rpl_row_mysqlbinlog fails on Windows.

into  mysql.com:/usr/home/bar/mysql-5.1-rpl


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/strict_autoinc_1myisam.result:
  Auto merged
mysql-test/r/strict_autoinc_2innodb.result:
  Auto merged
mysql-test/r/strict_autoinc_3heap.result:
  Auto merged
mysql-test/r/strict_autoinc_4bdb.result:
  Auto merged
mysql-test/r/strict_autoinc_5ndb.result:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/field.cc:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-5.0.b22877


BitKeeper/etc/collapsed:
  auto-union
sql/sql_parse.cc:
  Auto merged

sync using replicate-wild-ignore-table
Problem: changes in character set variables
before an action on an replication-ignored table
makes slave to forget new variable values.
Fix: initialize one_shot variables only when
4.1 -> 5.x replication is running.


mysql-test/r/rpl_ignore_table.result:
  Adding test case
mysql-test/t/rpl_ignore_table-slave.opt:
  Don't replicate tables with names starting with "tmptbl"
mysql-test/t/rpl_ignore_table.test:
  Adding test case
sql/sql_parse.cc:
  Reset one_shot variables only if we do 4.1->5.x replication.
  In other cases we cannot do that: resetting thd->variables out of sync with
  st_relay_log_info::cached_charset, which makes
  st_relay_log_info::cached_charset_compare() not to notice
  character set related variables changes afterwards.

make code easier to maintain.


sql/CMakeLists.txt:
  New file
sql/Makefile.am:
  New file
sql/rpl_rli.h:
  Changed master_info into a class
sql/slave.cc:
  Moved master info functionality into rpl_mi.cc
sql/slave.h:
  Moved master info functionality into rpl_mi.cc
sql/rpl_mi.cc:
  Moved master info functionality into rpl_mi.cc
sql/rpl_mi.h:
  Moved master info functionality into rpl_mi.cc

should be a separate module (i.e. a class) to make it easier to maintain the 
code, e.g. by having checks within the rli checking sanity of data and making 
member variables private.  This will also ease implementation of multi-source 
and, at least in my fantasies :), make it possible in some future to have 
separate replication servers.


sql/Makefile.am:
  Added file rpl_rli.cc
sql/repl_failsafe.cc:
  Move function
sql/rpl_rli.h:
  moved functions
sql/slave.cc:
  Moved rli code into rpl_rli.cc
sql/sql_repl.cc:
  Changed function to be member function
sql/rpl_rli.cc:
  Code for rli

post-merge fixes in test/result


mysql-test/extra/rpl_tests/rpl_deadlock.test:
  recalculating BEGIN's event position.
mysql-test/r/rpl_deadlock_innodb.result:
  results changed

into  dsl-hkigw8-feaef900-46.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50


mysql-test/r/rpl_deadlock_innodb.result:
  results changed
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  taking a fix for testing timed-out behaviour.
sql/slave.cc:
  just comments are fixed due to changes in behavior of timed-out msta.

  
  Problem: SHOW CREATE TABLE printed garbage in table
  name for tables having TURKISH I
  (i.e. LATIN CAPITABLE LETTER I WITH DOT ABOVE)
  when lower-case-table-name=1.
  
  Reason: In some cases during lower/upper conversion in utf8,
  the result string can be shorter the original string
  (including the above letter). Old implementation of caseup_str()
  and casedn_str() didn't handle the result length properly,
  assuming that length cannot change.
  
  This fix changes the result type of cs->cset->casedn_str()
  and cs->cset->caseup_str() from VOID to UINT, to return
  the result length, as well as put '\0' terminator on a 
  proper place.
  
  Also, my_caseup_str_utf8() and my_casedn_str_utf8() were 
  rewritten not to use strlen() for performance purposes.
  It was done with help of adding of new functions - my_utf8_uni_no_range()
  and my_uni_utf8_no_range() - for null terminated strings.



include/m_ctype.h:
  Changeing return type from void to int for caseup_str() and casedn_str()
mysql-test/r/lowercase_table.result:
  Adding test case
mysql-test/t/lowercase_table.test:
  Adding test case
sql/sql_parse.cc:
  Set table->table.length to result of my_casedn_str().
strings/ctype-bin.c:
  Changeing return type from void to int for caseup_str() and casedn_str()
strings/ctype-mb.c:
  Changeing return type from void to int for caseup_str() and casedn_str()
strings/ctype-simple.c:
  Changeing return type from void to int for caseup_str() and casedn_str()
strings/ctype-ucs2.c:
  Changeing return type from void to int for caseup_str() and casedn_str()
strings/ctype-utf8.c:
  Changeing return type from void to int for caseup_str() and casedn_str().
      Optimization, to get rid of strlen():
      Adding my_utf8_uni_no_range() and my_uni_utf8_no_range() - for null
      terninated strings.

into  mysql.com:/usr/home/bar/mysql-5.0.b18908


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged

Problem: Too confusing error message when cannot convert
between string and column character sets on INSERT and UPDATE.
Fix: producing a better error message, instead of "Data too long"
in such cases
Additional changes: Adding "DROP TABLE IF EXISTS" into several
tests to be safe against failures in previous tests. 


mysql-test/include/strict_autoinc.inc:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/ctype_recoding.result:
  Fixing test results
mysql-test/r/ctype_utf8.result:
  Fixing test results
mysql-test/r/fulltext.result:
  Fixing test results
mysql-test/r/strict_autoinc_1myisam.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_2innodb.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_3heap.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_4bdb.result:
  Adding DROP TABLE to be safe against previous tests failure.
mysql-test/r/strict_autoinc_5ndb.result:
  Adding DROP TABLE to be safe against previous tests failure.
sql/field.cc:
  - producing better error messages than
    "DATA TRUNCATED" or "DATA TOO LONG" (in strict mode)
    in case of "not well formed source" and
    "cannot convert to field character set"
  - Performance improvements: copying directly to
    the target, instead of using an intermediate
    String.
  - Moving duplicate code into report_data_too_long() function.
sql/sql_string.cc:
  Adding a new function to convert strings between character sets,
  but not more than "nchar" characters - a helper function for
  Field_string::store(), Field_varstring::store() and Field_blob::store().
sql/sql_string.h:
  Adding new function prototype.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


myisam/mi_open.c:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


myisam/mi_open.c:
  Auto merged
sql/slave.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


myisam/mi_open.c:
  Auto merged

results of binlog_stm_binlog in sync


mysql-test/r/binlog_stm_binlog.result:
  results changed

Bug #22027 CREATE TABLE IF NOT EXISTS SELECT logged improperly with row-based binlog
    
post-merge fix, also making results free from server's version number.


mysql-test/extra/binlog_tests/binlog.test:
  eliminating format-description line in show binlog events.
mysql-test/r/binlog_row_binlog.result:
  results changed

into  dsl-hkigw8-febefb00-148.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug22027_create_select_exists


sql/sql_show.cc:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  SCCS merged

Problem: "greater than" and "less than" XPath operators appeared to have been implemented in reverse.
Fix: swap arguments to eq_func() and eq_func_reverse() to provide correct operation result.


mysql-test/r/xml.result:
  Adding test case
mysql-test/t/xml.test:
  Adding test case
sql/item_xmlfunc.cc:
  Pass argumemtns to eq_func() and eq_func_reverse() in correct order:
  nodeset argument first, then scalar argument.
  Also, fixing eq_func_reverse() to do correct conversion, e.g:
  "scalar > nodeset" into "nodeset < scalar" instead of wrong "nodeset <= scalar"
  "scalar >= nodeset" into "nodeset <= scalar" instead of wrong "nodeset < scalar".

into  romeo.(none):/home/bk/mytap-mysql-5.1-new


unittest/mytap/tap.c:
  Auto merged
unittest/README.txt:
  Manual merge
unittest/mytap/tap.h:
  Manual merge

unittest/README.txt:
  Adding reference to generated documentation
unittest/mytap/Doxyfile:
  Some configuration changes to make Doxygen generate better documentation.
unittest/mytap/tap.c:
  Adding documentation and tags
unittest/mytap/tap.h:
  Adding tags to provide document-internal references.

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


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

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/myisam.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt


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

  merge fixes


mysql-test/r/mix2_myisam.result:
  merge fixes
mysql-test/r/type_decimal.result:
  merge fixes
sql/sql_rename.cc:
  merge fixes
sql/sql_table.cc:
  merge fixes

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


mysql-test/t/repair.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Manual merge.