After merge fix

into  mysql.com:/usr/local/mysql/tmp-5.1

into  mysql.com:/usr/local/mysql/tmp-5.1

Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.

into  mysql.com:/data0/knielsen/tmp-5.1

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1

  After merge fix

into  mysql.com:/usr/local/mysql/tmp-5.1

into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2

The problem was a call to convert_dirname() with a destination buffer
that did not have room for the trailing slash added by that function.
This could cause the instance manager to crash in some cases.

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

  An UNIQUE KEY consisting of NOT NULL columns
  was displayed as PRIMARY KEY in "DESC t1".
  According to the code, that was intentional
  behaviour for some reasons unknown to me.
  This code was written before bitkeeper time,
  so I cannot check who and why made this.
  After discussing on dev-public, a decision
  was made to remove this code

into  mysql.com:/home/my/mysql-5.1

(Happens if main thread exists before kill_server thread, which is ok)

into  mysql.com:/home/my/mysql-5.1

This change allows us to use the stmt_binlog function in the code without ifdefs
(We should avoid having ifdefs in the .cc and .c files)

into  mysql.com:/home/my/mysql-5.1

into  mysql.com:/home/my/mysql-5.1

Fixed wrong table flags type in ndbcluster that caused previous commit to fail

  Disable the simplistic auto dependency scan for test/bench (bug#20078)

into  mysql.com:/opt/local/work/mysql-5.0-runtime

into  mysql.com:/home/my/mysql-5.1

into  mysql.com:/home/my/mysql-5.1

is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15811

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781

      have to push this to be able to push 5.0

into  mysql.com:/opt/local/work/mysql-5.0-runtime

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15811

 with PREPARE fails with weird error".
More generally, re-executing a stored procedure with a complex SP cursor query
could lead to a crash.

The cause of the problem was that SP cursor queries were not optimized 
properly at first execution: their parse tree belongs to sp_instr_cpush,
not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
cursor was declared, not when it was opened. This led to loss of optimization
transformations performed at first execution, as sp_instr_copen saw that the
query is already "EXECUTED" and therefore either not ran first-execution 
related blocks or wrongly rolled back the transformations caused by 
first-execution code.
The fix is to update the state of the parsed tree only when the tree is
executed, as opposed to when the instruction containing the tree is executed.
Assignment if i->state is moved to reset_lex_and_exec_core.

The problem was in redundant calls to strlen() in string functions,
where we may then return after checking only the small number of characters.

No test case is provided since it's a performance fix.

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  mysql.com:/home/bk/fix-mysql-5.1