Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted', shared locking is sufficient


sql/ha_ndbcluster.cc:
  Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transacti

into  production.mysql.com:/usersnfs/abelkin/work-qc-5.0

into  mysql.com:/usr/local/mysql/mysql-5.0


mysql-test/lib/mtr_timer.pl:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

mysql-test/lib/mtr_timer.pl:
  Fix bug where ^C would trigger cleanup handler in both parent and
  timeout child processes, causing duplicated messages and potential
  conflicts.

into  xiphis.org:/home/antony/work2/p1-bug14575.1

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

  ¨MySQL server crashes if you try to access to InnoDB table¨
  crash caused by schizophrenic mysqld - 2 memory locations for logically same function
  with conflicting values.
  Fixed by backporting from 5.1 changes to have_xyz_db declarations.


sql/mysql_priv.h:
  Backport have_xyz_db changes from 5.1
sql/mysqld.cc:
  Backport have_xyz_db changes from 5.1

because it can couse problem with Query cache (BUG#14767)


mysql-test/r/query_cache_notembedded.result:
  BUG#14767 test suite.
mysql-test/t/query_cache_notembedded.test:
  BUG#14767 test suite.
sql/sql_insert.cc:
  Query cache invalidation table we was inserting in just after
  unlocking table added to avoid the race condition as we had
  with SP.
sql/sql_parse.cc:
  Query cache invalidation table we was inserting in just after
  unlocking table added to avoid the race condition as we had
  with SP.
sql/sql_yacc.yy:
  We should prohibit concurent read of unserting file in SP
  because it can cause problem with query cache.

into  kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084

  Backport option description change from 5.1 to 5.0.


sql/mysqld.cc:
  Backport option description change from 5.1 to 5.0.

  Afterfix for bug#17366: Unchecked Item_int results in server crash


sql/sql_select.cc:
  Afterfix for bug#17366: Unchecked Item_int results in server crash

 - Add HAVE_OPENSSL and HAVE_YASSL to config-win.h


include/config-win.h:
  Define HAVE_OPENSSL and HAVE_YASSL to make the server and client enable SSL support

into sunlight.local:/work_local/17336-bug-5.0-mysql


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

When there is conjunction of conds, the substitute_for_best_equal_field()
will call the eliminate_item_equal() function in loop to build final
expression. But if eliminate_item_equal() finds that some cond will always
evaluate to 0, then that cond will be substituted by Item_int with value ==
0. In this case on the next iteration eliminate_item_equal() will get that 
Item_int and treat it as Item_cond. This is leads to memory corruption and
server crash on cleanup phase.

To the eliminate_item_equal() function was added DBUG_ASSERT for checking
that all items treaten as Item_cond are really Item_cond.
The substitute_for_best_equal_field() now checks that if
eliminate_item_equal() returns Item_int and it's value is 0 then this 
value is returned as the result of whole conjunction.


mysql-test/t/subselect.test:
  Added test for bug#17366: Unchecked Item_int results in server crash
mysql-test/r/subselect.result:
   Added test for bug#17366: Unchecked Item_int results in server crash
sql/sql_select.cc:
  Fixed bug#17366: Unchecked Item_int results in server crash
   
  To the eliminate_item_equal() function was added DBUG_ASSERT for checking
  that all items treaten as Item_cond are really Item_cond.
  The substitute_for_best_equal_field() now checks that if
  eliminate_item_equal() returns something other than Item_cond and if it is
  then this value is returned as the result of whole conjunction.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

    ndb crash if trigger record get to big, fix incorrect max size of trigger record


ndb/src/kernel/blocks/backup/Backup.cpp:
  Increase size of max trigger record

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  ndb crash if trigger record get to big, fix incorrect max size of trigger record


ndb/src/kernel/blocks/backup/Backup.cpp:
  Increase size of max trigger record

into  shellback.(none):/home/msvensson/mysql/mysql-5.0


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

mysql-test/mysql-test-run.pl:
  Remove extra printouts

mysql-test/mysql-test-run.pl:
  Take a snapshot of the data dirs just after all db's have been installed and usedthat snasphot to restore the db(s) to a known state after a test case has failed.
  Thus avoiding subsequent test cases to fail because of previous test failures.

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into  mysql.com:/home/mydev/mysql-4.1-bug14980

into  mysql.com:/home/mydev/mysql-5.0-bug14980

Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.


client/mysqldump.c:
  Fixing version.
mysql-test/r/mysqldump.result:
  Updated the result file.

into mysql.com:/M50/merge-5.0

libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

Fixes bug#15861


include/my_no_pthread.h:
  Even in a non-threaded build, some modules (at least "mysys/mf_keycache.c")
  need some type definitions provided by the system header file "pthread.h".
  Rather than add complexity to the code, include the header.
  
  Fixes bug#15861

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate

   After the ChangeSet 1.1892.20.1 2005/08/24 (Bug #12562) SYSDATE() is not an alias
   of NOW() and is unsafe for replication.
   `SYSDATE()' backward compatible aliasing clashes with the idea #12562 
   fix. To make it safe-replicatable we have to either use RBR or to restore
   the pre-5.0 style.
   --sysdate-is-now command line flag was introduced to provide backward compatibility.


sql/mysqld.cc:
  New option to force SYSDATE's backward compatible with 4.1 aliasing to NOW (not default)
sql/sql_class.h:
  new slot to fill at init time and check at parse
sql/sql_yacc.yy:
  calling NOW's branches when --sysdate-is-now
mysql-test/r/sysdate_is_now.result:
  New BitKeeper file ``mysql-test/r/sysdate_is_now.result''
mysql-test/t/sysdate_is_now-master.opt:
  New BitKeeper file ``mysql-test/t/sysdate_is_now-master.opt''
mysql-test/t/sysdate_is_now.test:
  New BitKeeper file ``mysql-test/t/sysdate_is_now.test''