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


mysql-test/r/rpl_do_grant.result:
  Auto merged
mysql-test/t/rpl_do_grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged

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

client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/user_var-binlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/rpl_stm_charset.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  after merge fix.

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

into  suse.vabb.com:/home/Chuck/development/mysql-5.1_WL_3618


sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/table.cc:
  Auto merged

Please see worklog for details on files changed.


BitKeeper/deleted/.del-have_row_based.require:
  Delete: mysql-test/r/have_row_based.require
BitKeeper/deleted/.del-not_row_based.require:
  Delete: mysql-test/r/not_row_based.require
BitKeeper/deleted/.del-have_row_based.inc:
  Delete: mysql-test/include/have_row_based.inc
BitKeeper/deleted/.del-not_row_based.inc:
  Delete: mysql-test/include/not_row_based.inc
BitKeeper/deleted/.del-replication.m4:
  Delete: config/ac-macros/replication.m4

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


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/disabled.def:
  After merge fix

mysql-test/t/disabled.def:
  Disabling test in 5.0 temporarily
sql/mysql_priv.h:
  Adding number_par agrument to constructor
sql/sql_locale.cc:
  Using constructor, instead of structure initialization.

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


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log.cc:
  Removing one_shot from 5.0.
sql/sql_locale.cc:
  After merge fix
sql/set_var.cc:
  After merge fix
sql/set_var.h:
  After merge fix

Problem: replication of LC_TIME_NAMES didn't work.
Thus, INSERTS or UPDATES using date_format() always
worked with en_US on the slave side.
Fix: adding ONE_SHOT implementation for LC_TIME_NAMES.


mysql-test/r/variables.result:
  Adding various tests with LC_TIME_NAMES and
  string and numeric constants and expressions.
mysql-test/t/variables.test:
  Adding various tests with LC_TIME_NAMES and
  string and numeric constants and expressions.
sql/log.cc:
  Adding ONE_SHOT trick for lc_time_names.
sql/mysql_priv.h:
  Adding new member "number" - for unique locale IDs.
  Adding prototype for my_locale_by_number().
sql/set_var.cc:
  Modifying lc_time_names variable to understand both:
  - string valyes (using locale name)
  - number values (using locale IDs)
sql/set_var.h:
  - Marking lc_time_names as ONE_SHOT capable.
  - Marking lc_time_names as INT_RESULT compatible.
sql/sql_locale.cc:
  - adding local IDs
  - better layout for locale data declarations
    (splitting long lines into short ones)
  - adding DBUG_ASSERT into my_locale_by_name()
    and moving this function towards the end of file -
    after "my_locales" declaration
  - adding my_locale_by_number() implementation
sql/sql_parse.cc:
  Adding initialization of lc_time_names
  to its default value (en_US)
mysql-test/r/rpl_locale.result:
  Adding test case
mysql-test/t/rpl_locale.test:
  Adding test case

iterations on this platform


unittest/mysys/my_atomic-t.c:
  decrease number of iterations on hpux11 (to hopefully go from one hour
  to a few minutes).

Problem: ``SET PASSWORD FOR foo@localhost'' was written into
binary log using double quites: ``SET PASSWORD FOR "foo"@"localhost"...''.
If sql_mode was set to ANSI_QUOTES, parser on slave considered
"foo" and "localhost" as identifiers instead of strigns constants,
so it failed to parse, generated syntax error and slave then stopped.
Fix: changing binary log entries to use single quotes:
``SET PASSWORD FOR 'foo'@'localhost'...'' not to depend on ANSI_QUOTES.


mysql-test/r/rpl_do_grant.result:
  Adding test case
mysql-test/t/rpl_do_grant.test:
  Adding test case
sql/sql_acl.cc:
  Using single quotes instead of double quotes,
  not to fails when sql_mode=ANSI_QUOTES.

Problem: when loading mysqlbinlog dumps, CREATE PROCEDURE having semicolons
in their bodies failed.
Fix: Using safe delimiter "/*!*/;" to dump log entries.


client/mysqlbinlog.cc:
  - Adding PRINT_EVENT_INFO argument to dump_xxx_log_entries()
  - Setting delimiter to "/*!*/;" before calling dump functions
mysql-test/r/ctype_ucs_binlog.result:
  Fixing test results
mysql-test/r/mix_innodb_myisam_binlog.result:
  Fixing test results
mysql-test/r/mysqlbinlog.result:
  Fixing test results
  Adding test case
mysql-test/r/mysqlbinlog2.result:
  Fixing test results
mysql-test/r/rpl_charset.result:
  Fixing test results
mysql-test/r/rpl_timezone.result:
  Fixing test results
mysql-test/r/user_var-binlog.result:
  Fixing test results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Fixing LIKE expression
mysql-test/t/mysqlbinlog.test:
  Adding test case
sql/log_event.cc:
  Using print_event_info->delimiter instead of
  hard-coded semicolon as a query end marker.
sql/log_event.h:
  Adding new member to store delimiter.

The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops:
for any value of the byte x
x | 1 -> 1,  and x & 0 -> 0.
x, being a null_byte part of record[1] can be left unassigned even after
ha_innobase::index_read_idx because the above and still be correct.
Addding a check memory upon the invocation of the function can detect this fact
long before record[1], old record, is eventually passed to my_write.

Fixed with initialization of record[1]'s null_bytes part in open_table_from_share.


sql/table.cc:
  initializing part of record[1]

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


sql/log_event.cc:
  Auto merged

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

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

Removing DBUG_DUMP printouts for valgrind builds since they trigger warnings.
Removing valgrind memory checks completely.
Removing bzero() of record when opening table that was added earlier.


sql/log_event.cc:
  Removing DBUG_DUMP of records for valgrind builds since they trigger false valgrind
  warnings.
  Removing valgrind checks completely, since they can trigger false valgrind warnings.
sql/sql_class.cc:
  Removing DBUG_DUMP of records for valgrind builds since they trigger false valgrind
  warnings.
sql/table.cc:
  Removing extreneous bzero() that were added previously.

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


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Empty merge of a backport patch

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


sql/item_timefunc.cc:
  Auto merged
client/mysqldump.c:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
mysql-test/r/mysqldump.result:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
mysql-test/t/mysqldump.test:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"

Moving tests to 4.1 section

Moving tests into their new place into 4.1 tests section

Backporting from 5.0


mysql-test/r/mysqldump.result:
  Adding test case
mysql-test/t/mysqldump.test:
  Adding test case

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

Fix to correct behaviour of find_and_fetch_row() for tables that have primary keys stored
in storage engines that support the fast method to fetch rows given a primary key. The
method uses position() to retrieve the key for a given record and rnd_pos() to position
the internal "cursor" at the row. Rnd_pos() returns the found record in table->record[0],
so the record has to be moved to table->record[1] for further processing after calling
find_and_fetch_row().


sql/log_event.cc:
  Adding code to one exit branch of find_and_fetch_row() to move output record from
  table->record[0] to table->record[1].
  Adding function to do valgrind memory check.
  Adding valgrind memory checks to check that records are defined when they should be.
  Adding Doxygen comment to find_and_fetch_row() with pre- and post-conditions.

into  amd64.:D:/src/mysql-5.1_bug23983

- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Create OS specific versions of these
tests.


mysql-test/r/ps.result:
  Bug#23983 ps.test fails to open shared library
  - Moving to OS specific results.
mysql-test/r/windows.result:
  Bug#23983 ps.test fails to open shared library
  - OS Specific result for shared library argument with path
mysql-test/t/ps.test:
  Bug#23983 ps.test fails to open shared library
  - Moving to OS specific tests.
mysql-test/t/windows.test:
  Bug#23983 ps.test fails to open shared library
  - OS Specific test for shared library argument with path
mysql-test/r/ps_not_windows.result:
  Bug#23983 ps.test fails to open shared library
  - OS Specific result for shared library argument with path
mysql-test/t/ps_not_windows.test:
  Bug#23983 ps.test fails to open shared library
  - OS Specific test for shared library argument with path

  - Disconnect from transporter before starting to delete objects


storage/ndb/src/ndbapi/Ndbinit.cpp:
  Make sure to disconnect from transporter to stop signals from coming in
  before starting to delete the objects that would recieve the signals

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


sql/item_timefunc.cc:
  Auto merged

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


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After merge fix

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


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After merge fix
sql/item_timefunc.cc:
  After merge fix

  
  open_table_from_share did not initialize table->record members. that was
  interpreted as the error by valgrind.
  
  Fixed with bzero-ing the members if compilation with -DHAVE_purify.


sql/table.cc:
  zeroing memory allocated for table->record[]

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

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


sql/log_event.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Use local