into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/sql_insert.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/field.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  results changed due to 
  1. tt table made temporary is it's supposed to; 
  2. show master status is turned into binlog pos masking-out macro
  3. merge defect for select_insert::abort()
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  masking-out binlog postions in the results via 
  source include/show_binlog_events.inc;
sql/sql_insert.cc:
  merging defect in not applied hunk for select_insert::abort() is fixed

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  follow-up of the previous manual resolve. The snippet is moved into the heading
  file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  results changed
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  removing explicit offsets from report;
  appending bug#27417,23333,28960 related snippet, addressing left TODO:s.
mysql-test/suite/rpl/r/rpl_packet.result:
  results changed
mysql-test/suite/rpl/t/rpl_packet.test:
  fixing row/stmt compatibility with #-ing out unneeded values

into  dl145j.mysql.com:/tmp/andrei/5.1-merge


BitKeeper/deleted/.del-sp_trans_log.result:
  Auto merged
BitKeeper/deleted/.del-sp_trans_log.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  should be re-recorded
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  manual merge
mysql-test/suite/rpl/t/rpl_packet.test:
  manual merge
sql/slave.cc:
  manual merge
sql/sql_insert.cc:
  manual merge - installing 5.0 patch logics
sql/sql_load.cc:
  manual merge

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_30790

This patch clarifies some of the coding choices with documentationa and
removes a limitation in the code for future expansion of the CHAR and
BINARY fields to length > 255.


sql/field.cc:
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch adds an assertion to ensure we are not attempting to encode
  negative values.
sql/log_event.cc:
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch adds comments to help explain the choice of variable types.
sql/rpl_utility.cc:
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch removes code from the calc_field_size that is not needed and
  was ambiguous. Originally intended to future expansion, the code was
  not needed.
  
  Also added are comments to help explain some portions of the code.
  
  A change was made to the korr method to use the unsigned version to 
  avoid extended sign problems.
sql/rpl_utility.h:
  BUG#30790 : Suspicious code in rpl_utility.cc
  
  This patch corrects some type discrepencies and removes an extra cast.

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/suite/ndb/r/ndb_dd_basic.result:
  Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/log_event_old.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  Manual merge
mysql-test/suite/rpl_ndb/t/disabled.def:
  Manual merge
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/sql_insert.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge

into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime

the first query is not running while we are doing wait queries on
a second connection.


mysql-test/r/insert_notembedded.result:
  Test case result for bug 28587 moved from insert_update.result
mysql-test/r/insert_update.result:
  Remove test case result for bug 28587, moving to insert_notembedded.result
mysql-test/t/insert_notembedded.test:
  Test case result for bug 28587, moved from insert_update.test
mysql-test/t/insert_update.test:
  Remove test case for bug 28587, moving to insert_notembedded.test

mysql-test/t/events.test:
  Wait until event scheduler thread reaches exactly the same state
  which later appears in the results of select from processlist.

into  omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge

into  omega.weblab:/home/malff/TREE/mysql-5.1-cleanup

Fixed test failure under heavy load, in case truncate table is slow.


mysql-test/r/events_logs_tests.result:
  Fixed test failure under heavy load, in case truncate table is slow.
mysql-test/t/events_logs_tests.test:
  Fixed test failure under heavy load, in case truncate table is slow.

the first query is not running while we are doing wait queries on
a second connection.


mysql-test/r/sp.result:
  Remove test case result for Bug#29936, moving to sp_notembedded.result
mysql-test/r/sp_notembedded.result:
  Test case result for Bug#29936, moved from sp.result
mysql-test/t/sp.test:
  Remove test case for Bug#29936, moving to sp_notembedded.test
mysql-test/t/sp_notembedded.test:
  Test case result for Bug#29936, moved from sp.test

Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 


client/mysqlslap.c:
  Cleanup resuls if rows are returned.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged

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

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


sql/sql_cache.cc:
  Auto merged

mysql-test/suite/rpl_ndb/t/disabled.def:
  The rpl_ndb_2other test must be disabled until replication correctly
  handles endianess issues.

into  station.:/mnt/raid/alik/MySQL/5.1-rt-build

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


sql/sql_cache.cc:
  Auto merged

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


sql/sql_cache.cc:
  Null merge

statement.


mysql-test/suite/rpl/r/rpl_ps.result:
  Update result file.

c++config.h now has the following code:
// For example, <windows.h> is known to #define min and max as macros...
#undef min
#undef max

So, our defines in my_global.h are undefined when <new> header
is included.

Move definitions of min()/max() to the end of my_global.h.

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


sql/sql_cache.cc:
  Auto merged

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


sql/sql_cache.cc:
  Auto merged

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


sql/sql_cache.cc:
  Auto merged

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


sql/sql_cache.cc:
  Null merge

Invaldating a subset of a sufficiently large query cache can take a long time.
During this time the server is efficiently frozen and no other operation can
be executed. This patch addresses this problem by setting a time limit on
how long time a dictionary access request can take before giving up on the 
attempt. This patch does not work for query cache invalidations issued by
DROP, ALTER or RENAME TABLE operations.


sql/sql_cache.cc:
  Changed mutex locking to a timed spinn lock. If access to query cache dictionary
  takes "a long time" (currently more than 0.1 seconds) the system fall backs on
  ordinary statement execution.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint